371 files changed, 57067 insertions, 31961 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..611ab4750
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,169 @@
+# This file is an example configuration for clang-format 5.0.
+#
+# Note that this style definition should only be understood as a hint
+# for writing new code. The rules are still work-in-progress and does
+# not yet exactly match the style we have in the existing code.
+
+# Use tabs whenever we need to fill whitespace that spans at least from one tab
+# stop to the next one.
+UseTab: Always
+TabWidth: 8
+IndentWidth: 8
+ContinuationIndentWidth: 8
+ColumnLimit: 80
+
+# C Language specifics
+Language: Cpp
+
+# Align parameters on the open bracket
+# someLongFunction(argument1,
+#                  argument2);
+AlignAfterOpenBracket: Align
+
+# Don't align consecutive assignments
+# int aaaa = 12;
+# int b = 14;
+AlignConsecutiveAssignments: false
+
+# Don't align consecutive declarations
+# int aaaa = 12;
+# double b = 3.14;
+AlignConsecutiveDeclarations: false
+
+# Align escaped newlines as far left as possible
+# #define A   \
+#   int aaaa; \
+#   int b;    \
+#   int cccccccc;
+AlignEscapedNewlines: Left
+
+# Align operands of binary and ternary expressions
+# int aaa = bbbbbbbbbbb +
+#           cccccc;
+AlignOperands: true
+
+# Don't align trailing comments
+# int a; // Comment a
+# int b = 2; // Comment b
+AlignTrailingComments: false
+
+# By default don't allow putting parameters onto the next line
+# myFunction(foo, bar, baz);
+AllowAllParametersOfDeclarationOnNextLine: false
+
+# Don't allow short braced statements to be on a single line
+# if (a)           not       if (a) return;
+#   return;
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+
+# By default don't add a line break after the return type of top-level functions
+# int foo();
+AlwaysBreakAfterReturnType: None
+
+# Pack as many parameters or arguments onto the same line as possible
+# int myFunction(int aaaaaaaaaaaa, int bbbbbbbb,
+#                int cccc);
+BinPackArguments: true
+BinPackParameters: true
+
+# Attach braces to surrounding context except break before braces on function
+# definitions.
+# void foo()
+# {
+#    if (true) {
+#    } else {
+#    }
+# };
+BreakBeforeBraces: Linux
+
+# Break after operators
+# int valuve = aaaaaaaaaaaaa +
+#              bbbbbb -
+#              ccccccccccc;
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+
+# Don't break string literals
+BreakStringLiterals: false
+
+# Use the same indentation level as for the switch statement.
+# Switch statement body is always indented one level more than case labels.
+IndentCaseLabels: false
+
+# Don't indent a function definition or declaration if it is wrapped after the
+# type
+IndentWrappedFunctionNames: false
+
+# Align pointer to the right
+# int *a;
+PointerAlignment: Right
+
+# Don't insert a space after a cast
+# x = (int32)y;    not    x = (int32) y;
+SpaceAfterCStyleCast: false
+
+# Insert spaces before and after assignment operators
+# int a = 5;    not    int a=5;
+# a += 42;             a+=42;
+SpaceBeforeAssignmentOperators: true
+
+# Put a space before opening parentheses only after control statement keywords.
+# void f() {
+#   if (true) {
+#     f();
+#   }
+# }
+SpaceBeforeParens: ControlStatements
+
+# Don't insert spaces inside empty '()'
+SpaceInEmptyParentheses: false
+
+# The number of spaces before trailing line comments (// - comments).
+# This does not affect trailing block comments (/* - comments).
+SpacesBeforeTrailingComments: 1
+
+# Don't insert spaces in casts
+# x = (int32) y;    not    x = ( int32 ) y;
+SpacesInCStyleCastParentheses: false
+
+# Don't insert spaces inside container literals
+# var arr = [1, 2, 3];    not    var arr = [ 1, 2, 3 ];
+SpacesInContainerLiterals: false
+
+# Don't insert spaces after '(' or before ')'
+# f(arg);    not    f( arg );
+SpacesInParentheses: false
+
+# Don't insert spaces after '[' or before ']'
+# int a[5];    not    int a[ 5 ];
+SpacesInSquareBrackets: false
+
+# Insert a space after '{' and before '}' in struct initializers
+Cpp11BracedListStyle: false
+
+# A list of macros that should be interpreted as foreach loops instead of as
+# function calls.
+ForEachMacros: ['for_each_string_list_item']
+
+# The maximum number of consecutive empty lines to keep.
+MaxEmptyLinesToKeep: 1
+
+# No empty line at the start of a block.
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+# Penalties
+# This decides what order things should be done if a line is too long
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 5
+
+# Don't sort #include's
+SortIncludes: false
diff --git a/.travis.yml b/.travis.yml
index 278943d14..fead995ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,23 +61,8 @@ matrix:
       services:
         - docker
       before_install:
-        - docker pull daald/ubuntu32:xenial
       before_script:
-      script:
-        - >
-          docker run
-          --interactive
-          --env DEVELOPER
-          --env DEFAULT_TEST_TARGET
-          --env GIT_PROVE_OPTS
-          --env GIT_TEST_OPTS
-          --env GIT_TEST_CLONE_2GB
-          --volume "${PWD}:/usr/src/git"
-          daald/ubuntu32:xenial
-          /usr/src/git/ci/run-linux32-build.sh $(id -u $USER)
-        # Use the following command to debug the docker build locally:
-        # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
-        # root@container:/# /usr/src/git/ci/run-linux32-build.sh
+      script: ci/run-linux32-docker.sh
     - env: Static Analysis
       os: linux
       compiler:
@@ -86,9 +71,8 @@ matrix:
           packages:
           - coccinelle
       before_install:
-      script:
-        # "before_script" that builds Git is inherited from base job
-        - make coccicheck
+      # "before_script" that builds Git is inherited from base job
+      script: ci/run-static-analysis.sh
       after_failure:
     - env: Documentation
       os: linux
@@ -99,70 +83,14 @@ matrix:
           - asciidoc
           - xmlto
       before_install:
-      before_script: gem install asciidoctor
+      before_script:
       script: ci/test-documentation.sh
       after_failure:
 
-before_install:
-  - >
-    case "${TRAVIS_OS_NAME:-linux}" in
-    linux)
-      export GIT_TEST_HTTPD=YesPlease
-
-      mkdir --parents custom/p4
-      pushd custom/p4
-        wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
-        wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
-        chmod u+x p4d
-        chmod u+x p4
-        export PATH="$(pwd):$PATH"
-      popd
-      mkdir --parents custom/git-lfs
-      pushd custom/git-lfs
-        wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
-        tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
-        cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
-        export PATH="$(pwd):$PATH"
-      popd
-      ;;
-    osx)
-      brew update --quiet
-      # Uncomment this if you want to run perf tests:
-      # brew install gnu-time
-      brew install git-lfs gettext
-      brew link --force gettext
-      brew install caskroom/cask/perforce
-      ;;
-    esac;
-    echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)";
-    p4d -V | grep Rev.;
-    echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)";
-    p4 -V | grep Rev.;
-    echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)";
-    git-lfs version;
-
-before_script: make --jobs=2
-
-script:
-  - >
-    mkdir -p $HOME/travis-cache;
-    ln -s $HOME/travis-cache/.prove t/.prove;
-    make --quiet test;
-
-after_failure:
-  - >
-    : '<-- Click here to see detailed test output!                                                        ';
-    for TEST_EXIT in t/test-results/*.exit;
-    do
-      if [ "$(cat "$TEST_EXIT")" != "0" ];
-      then
-        TEST_OUT="${TEST_EXIT%exit}out";
-        echo "------------------------------------------------------------------------";
-        echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)";
-        echo "------------------------------------------------------------------------";
-        cat "${TEST_OUT}";
-      fi;
-    done;
+before_install: ci/install-dependencies.sh
+before_script: ci/run-build.sh
+script: ci/run-tests.sh
+after_failure: ci/print-test-failures.sh
 
 notifications:
   email: false
diff --git a/.tsan-suppressions b/.tsan-suppressions
new file mode 100644
index 000000000..8c85014a0
--- /dev/null
+++ b/.tsan-suppressions
@@ -0,0 +1,10 @@
+# Suppressions for ThreadSanitizer (tsan).
+#
+# This file is used by setting the environment variable TSAN_OPTIONS to, e.g.,
+# "suppressions=$(pwd)/.tsan-suppressions". Observe that relative paths such as
+# ".tsan-suppressions" might not work.
+
+# A static variable is written to racily, but we always write the same value, so
+# in practice it (hopefully!) doesn't matter.
+race:^want_color$
+race:^transfer_debug$
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2415e0d65..471bb2972 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -67,6 +67,7 @@ SP_ARTICLES += howto/maintain-git
 API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
 SP_ARTICLES += $(API_DOCS)
 
+TECH_DOCS += technical/hash-function-transition
 TECH_DOCS += technical/http-protocol
 TECH_DOCS += technical/index-format
 TECH_DOCS += technical/pack-format
diff --git a/Documentation/RelNotes/2.14.3.txt b/Documentation/RelNotes/2.14.3.txt
index 61f569aa9..977c9e857 100644
--- a/Documentation/RelNotes/2.14.3.txt
+++ b/Documentation/RelNotes/2.14.3.txt
@@ -72,4 +72,28 @@ Fixes since v2.14.2
    them as the patch created internally by "git add -p" were colored
    (heh) and made unusable.  This has been fixed.
 
+ * "git branch -M a b" while on a branch that is completely unrelated
+   to either branch a or branch b misbehaved when multiple worktree
+   was in use.  This has been fixed.
+
+ * "git fast-export" with -M/-C option issued "copy" instruction on a
+   path that is simultaneously modified, which was incorrect.
+
+ * The checkpoint command "git fast-import" did not flush updates to
+   refs and marks unless at least one object was created since the
+   last checkpoint, which has been corrected, as these things can
+   happen without any new object getting created.
+
+ * The scripts to drive TravisCI has been reorganized and then an
+   optimization to avoid spending cycles on a branch whose tip is
+   tagged has been implemented.
+
+ * "git fetch <there> <src>:<dst>" allows an object name on the <src>
+   side when the other side accepts such a request since Git v2.5, but
+   the documentation was left stale.
+
+ * A regression in 2.11 that made the code to read the list of
+   alternate object stores overrun the end of the string has been
+   fixed.
+
 Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
new file mode 100644
index 000000000..541815ee3
--- /dev/null
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -0,0 +1,501 @@
+Git 2.15 Release Notes
+======================
+
+Backward compatibility notes and other notable changes.
+
+ * Use of an empty string as a pathspec element that is used for
+   'everything matches' is still warned and Git asks users to use a
+   more explicit '.' for that instead.  The hope is that existing
+   users will not mind this change, and eventually the warning can be
+   turned into a hard error, upgrading the deprecation into removal of
+   this (mis)feature.  That is now scheduled to happen in Git v2.16,
+   the next major release after this one.
+
+ * Git now avoids blindly falling back to ".git" when the setup
+   sequence said we are _not_ in Git repository.  A corner case that
+   happens to work right now may be broken by a call to BUG().
+   We've tried hard to locate such cases and fixed them, but there
+   might still be cases that need to be addressed--bug reports are
+   greatly appreciated.
+
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+   finally been retired.
+
+
+Updates since v2.14
+-------------------
+
+UI, Workflows & Features
+
+ * An example that is now obsolete has been removed from a sample hook,
+   and an old example in it that added a sign-off manually has been
+   improved to use the interpret-trailers command.
+
+ * The advice message given when "git rebase" stops for conflicting
+   changes has been improved.
+
+ * The "rerere-train" script (in contrib/) learned the "--overwrite"
+   option to allow overwriting existing recorded resolutions.
+
+ * "git contacts" (in contrib/) now lists the address on the
+   "Reported-by:" trailer to its output, in addition to those on
+   S-o-b: and other trailers, to make it easier to notify (and thank)
+   the original bug reporter.
+
+ * "git rebase", especially when it is run by mistake and ends up
+   trying to replay many changes, spent long time in silence.  The
+   command has been taught to show progress report when it spends
+   long time preparing these many changes to replay (which would give
+   the user a chance to abort with ^C).
+
+ * "git merge" learned a "--signoff" option to add the Signed-off-by:
+   trailer with the committer's name.
+
+ * "git diff" learned to optionally paint new lines that are the same
+   as deleted lines elsewhere differently from genuinely new lines.
+
+ * "git interpret-trailers" learned to take the trailer specifications
+   from the command line that overrides the configured values.
+
+ * "git interpret-trailers" has been taught a "--parse" and a few
+   other options to make it easier for scripts to grab existing
+   trailer lines from a commit log message.
+
+ * The "--format=%(trailers)" option "git log" and its friends take
+   learned to take the 'unfold' and 'only' modifiers to normalize its
+   output, e.g. "git log --format=%(trailers:only,unfold)".
+
+ * "gitweb" shows a link to visit the 'raw' contents of blbos in the
+   history overview page.
+
+ * "[gc] rerereResolved = 5.days" used to be invalid, as the variable
+   is defined to take an integer counting the number of days.  It now
+   is allowed.
+
+ * The code to acquire a lock on a reference (e.g. while accepting a
+   push from a client) used to immediately fail when the reference is
+   already locked---now it waits for a very short while and retries,
+   which can make it succeed if the lock holder was holding it during
+   a read-only operation.
+
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+   finally been retired.
+
+ * The codepath to call external process filter for smudge/clean
+   operation learned to show the progress meter.
+
+ * "git rev-parse" learned "--is-shallow-repository", that is to be
+   used in a way similar to existing "--is-bare-repository" and
+   friends.
+
+ * "git describe --match <pattern>" has been taught to play well with
+   the "--all" option.
+
+ * "git branch" learned "-c/-C" to create a new branch by copying an
+   existing one.
+
+ * Some commands (most notably "git status") makes an opportunistic
+   update when performing a read-only operation to help optimize later
+   operations in the same repository.  The new "--no-optional-locks"
+   option can be passed to Git to disable them.
+
+ * "git for-each-ref --format=..." learned a new format element,
+   %(trailers), to show only the commit log trailer part of the log
+   message.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * Start using selected c99 constructs in small, stable and
+   essentialpart of the system to catch people who care about
+   older compilers that do not grok them.
+
+ * The filter-process interface learned to allow a process with long
+   latency give a "delayed" response.
+
+ * Many uses of comparision callback function the hashmap API uses
+   cast the callback function type when registering it to
+   hashmap_init(), which defeats the compile time type checking when
+   the callback interface changes (e.g. gaining more parameters).
+   The callback implementations have been updated to take "void *"
+   pointers and cast them to the type they expect instead.
+
+ * Because recent Git for Windows do come with a real msgfmt, the
+   build procedure for git-gui has been updated to use it instead of a
+   hand-rolled substitute.
+
+ * "git grep --recurse-submodules" has been reworked to give a more
+   consistent output across submodule boundary (and do its thing
+   without having to fork a separate process).
+
+ * A helper function to read a single whole line into strbuf
+   mistakenly triggered OOM error at EOF under certain conditions,
+   which has been fixed.
+
+ * The "ref-store" code reorganization continues.
+
+ * "git commit" used to discard the index and re-read from the filesystem
+   just in case the pre-commit hook has updated it in the middle; this
+   has been optimized out when we know we do not run the pre-commit hook.
+   (merge 680ee550d7 kw/commit-keep-index-when-pre-commit-is-not-run later to maint).
+
+ * Updates to the HTTP layer we made recently unconditionally used
+   features of libCurl without checking the existence of them, causing
+   compilation errors, which has been fixed.  Also migrate the code to
+   check feature macros, not version numbers, to cope better with
+   libCurl that vendor ships with backported features.
+
+ * The API to start showing progress meter after a short delay has
+   been simplified.
+   (merge 8aade107dd jc/simplify-progress later to maint).
+
+ * Code clean-up to avoid mixing values read from the .gitmodules file
+   and values read from the .git/config file.
+
+ * We used to spend more than necessary cycles allocating and freeing
+   piece of memory while writing each index entry out.  This has been
+   optimized.
+
+ * Platforms that ship with a separate sha1 with collision detection
+   library can link to it instead of using the copy we ship as part of
+   our source tree.
+
+ * Code around "notes" have been cleaned up.
+   (merge 3964281524 mh/notes-cleanup later to maint).
+
+ * The long-standing rule that an in-core lockfile instance, once it
+   is used, must not be freed, has been lifted and the lockfile and
+   tempfile APIs have been updated to reduce the chance of programming
+   errors.
+
+ * Our hashmap implementation in hashmap.[ch] is not thread-safe when
+   adding a new item needs to expand the hashtable by rehashing; add
+   an API to disable the automatic rehashing to work it around.
+
+ * Many of our programs consider that it is OK to release dynamic
+   storage that is used throughout the life of the program by simply
+   exiting, but this makes it harder to leak detection tools to avoid
+   reporting false positives.  Plug many existing leaks and introduce
+   a mechanism for developers to mark that the region of memory
+   pointed by a pointer is not lost/leaking to help these tools.
+
+ * As "git commit" to conclude a conflicted "git merge" honors the
+   commit-msg hook, "git merge" that records a merge commit that
+   cleanly auto-merges should, but it didn't.
+
+ * The codepath for "git merge-recursive" has been cleaned up.
+
+ * Many leaks of strbuf have been fixed.
+
+ * "git imap-send" has our own implementation of the protocol and also
+   can use more recent libCurl with the imap protocol support.  Update
+   the latter so that it can use the credential subsystem, and then
+   make it the default option to use, so that we can eventually
+   deprecate and remove the former.
+
+ * "make style" runs git-clang-format to help developers by pointing
+   out coding style issues.
+
+ * A test to demonstrate "git mv" failing to adjust nested submodules
+   has been added.
+   (merge c514167df2 hv/mv-nested-submodules-test later to maint).
+
+ * On Cygwin, "ulimit -s" does not report failure but it does not work
+   at all, which causes an unexpected success of some tests that
+   expect failures under a limited stack situation.  This has been
+   fixed.
+
+ * Many codepaths have been updated to squelch -Wimplicit-fallthrough
+   warnings from Gcc 7 (which is a good code hygiene).
+
+ * Add a helper for DLL loading in anticipation for its need in a
+   future topic RSN.
+
+ * "git status --ignored", when noticing that a directory without any
+   tracked path is ignored, still enumerated all the ignored paths in
+   the directory, which is unnecessary.  The codepath has been
+   optimized to avoid this overhead.
+
+ * The final batch to "git rebase -i" updates to move more code from
+   the shell script to C has been merged.
+
+ * Operations that do not touch (majority of) packed refs have been
+   optimized by making accesses to packed-refs file lazy; we no longer
+   pre-parse everything, and an access to a single ref in the
+   packed-refs does not touch majority of irrelevant refs, either.
+
+ * Add comment to clarify that the style file is meant to be used with
+   clang-5 and the rules are still work in progress.
+
+ * Many variables that points at a region of memory that will live
+   throughout the life of the program have been marked with UNLEAK
+   marker to help the leak checkers concentrate on real leaks..
+
+ * Plans for weaning us off of SHA-1 has been documented.
+
+ * A new "oidmap" API has been introduced and oidset API has been
+   rewritten to use it.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.14
+-----------------
+
+ * "%C(color name)" in the pretty print format always produced ANSI
+   color escape codes, which was an early design mistake.  They now
+   honor the configuration (e.g. "color.ui = never") and also tty-ness
+   of the output medium.
+
+ * The http.{sslkey,sslCert} configuration variables are to be
+   interpreted as a pathname that honors "~[username]/" prefix, but
+   weren't, which has been fixed.
+
+ * Numerous bugs in walking of reflogs via "log -g" and friends have
+   been fixed.
+
+ * "git commit" when seeing an totally empty message said "you did not
+   edit the message", which is clearly wrong.  The message has been
+   corrected.
+
+ * When a directory is not readable, "gitweb" fails to build the
+   project list.  Work this around by skipping such a directory.
+
+ * Some versions of GnuPG fails to kill gpg-agent it auto-spawned
+   and such a left-over agent can interfere with a test.  Work it
+   around by attempting to kill one before starting a new test.
+
+ * A recently added test for the "credential-cache" helper revealed
+   that EOF detection done around the time the connection to the cache
+   daemon is torn down were flaky.  This was fixed by reacting to
+   ECONNRESET and behaving as if we got an EOF.
+
+ * "git log --tag=no-such-tag" showed log starting from HEAD, which
+   has been fixed---it now shows nothing.
+
+ * The "tag.pager" configuration variable was useless for those who
+   actually create tag objects, as it interfered with the use of an
+   editor.  A new mechanism has been introduced for commands to enable
+   pager depending on what operation is being carried out to fix this,
+   and then "git tag -l" is made to run pager by default.
+
+ * "git push --recurse-submodules $there HEAD:$target" was not
+   propagated down to the submodules, but now it is.
+
+ * Commands like "git rebase" accepted the --rerere-autoupdate option
+   from the command line, but did not always use it.  This has been
+   fixed.
+
+ * "git clone --recurse-submodules --quiet" did not pass the quiet
+   option down to submodules.
+
+ * Test portability fix for OBSD.
+
+ * Portability fix for OBSD.
+
+ * "git am -s" has been taught that some input may end with a trailer
+   block that is not Signed-off-by: and it should refrain from adding
+   an extra blank line before adding a new sign-off in such a case.
+
+ * "git svn" used with "--localtime" option did not compute the tz
+   offset for the timestamp in question and instead always used the
+   current time, which has been corrected.
+
+ * Memory leak in an error codepath has been plugged.
+
+ * "git stash -u" used the contents of the committed version of the
+   ".gitignore" file to decide which paths are ignored, even when the
+   file has local changes.  The command has been taught to instead use
+   the locally modified contents.
+
+ * bash 4.4 or newer gave a warning on NUL byte in command
+   substitution done in "git stash"; this has been squelched.
+
+ * "git grep -L" and "git grep --quiet -L" reported different exit
+   codes; this has been corrected.
+
+ * When handshake with a subprocess filter notices that the process
+   asked for an unknown capability, Git did not report what program
+   the offending subprocess was running.  This has been corrected.
+
+ * "git apply" that is used as a better "patch -p1" failed to apply a
+   taken from a file with CRLF line endings to a file with CRLF line
+   endings.  The root cause was because it misused convert_to_git()
+   that tried to do "safe-crlf" processing by looking at the index
+   entry at the same path, which is a nonsense---in that mode, "apply"
+   is not working on the data in (or derived from) the index at all.
+   This has been fixed.
+
+ * Killing "git merge --edit" before the editor returns control left
+   the repository in a state with MERGE_MSG but without MERGE_HEAD,
+   which incorrectly tells the subsequent "git commit" that there was
+   a squash merge in progress.  This has been fixed.
+
+ * "git archive" did not work well with pathspecs and the
+   export-ignore attribute.
+
+ * In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft"
+   was taught to "git send-email" as a valid way to tell it that it
+   needs to also send a carbon copy to <a@dd.re.ss> in the trailer
+   section.
+
+ * "git branch -M a b" while on a branch that is completely unrelated
+   to either branch a or branch b misbehaved when multiple worktree
+   was in use.  This has been fixed.
+   (merge 31824d180d nd/worktree-kill-parse-ref later to maint).
+
+ * "git gc" and friends when multiple worktrees are used off of a
+   single repository did not consider the index and per-worktree refs
+   of other worktrees as the root for reachability traversal, making
+   objects that are in use only in other worktrees to be subject to
+   garbage collection.
+
+ * A regression to "gitk --bisect" by a recent update has been fixed.
+
+ * "git -c submodule.recurse=yes pull" did not work as if the
+   "--recurse-submodules" option was given from the command line.
+   This has been corrected.
+
+ * Unlike "git commit-tree < file", "git commit-tree -F file" did not
+   pass the contents of the file verbatim and instead completed an
+   incomplete line at the end, if exists.  The latter has been updated
+   to match the behaviour of the former.
+
+ * Many codepaths did not diagnose write failures correctly when disks
+   go full, due to their misuse of write_in_full() helper function,
+   which have been corrected.
+   (merge f48ecd38cb jk/write-in-full-fix later to maint).
+
+ * "git help co" now says "co is aliased to ...", not "git co is".
+   (merge b3a8076e0d ks/help-alias-label later to maint).
+
+ * "git archive", especially when used with pathspec, stored an empty
+   directory in its output, even though Git itself never does so.
+   This has been fixed.
+
+ * API error-proofing which happens to also squelch warnings from GCC.
+
+ * The explanation of the cut-line in the commit log editor has been
+   slightly tweaked.
+   (merge 8c4b1a3593 ks/commit-do-not-touch-cut-line later to maint).
+
+ * "git gc" tries to avoid running two instances at the same time by
+   reading and writing pid/host from and to a lock file; it used to
+   use an incorrect fscanf() format when reading, which has been
+   corrected.
+
+ * The scripts to drive TravisCI has been reorganized and then an
+   optimization to avoid spending cycles on a branch whose tip is
+   tagged has been implemented.
+   (merge 8376eb4a8f ls/travis-scriptify later to maint).
+
+ * The test linter has been taught that we do not like "echo -e".
+
+ * Code cmp.std.c nitpick.
+
+ * A regression fix for 2.11 that made the code to read the list of
+   alternate object stores overrun the end of the string.
+   (merge f0f7bebef7 jk/info-alternates-fix later to maint).
+
+ * "git describe --match" learned to take multiple patterns in v2.13
+   series, but the feature ignored the patterns after the first one
+   and did not work at all.  This has been fixed.
+
+ * "git filter-branch" cannot reproduce a history with a tag without
+   the tagger field, which only ancient versions of Git allowed to be
+   created.  This has been corrected.
+   (merge b2c1ca6b4b ic/fix-filter-branch-to-handle-tag-without-tagger later to maint).
+
+ * "git cat-file --textconv" started segfaulting recently, which
+   has been corrected.
+
+ * The built-in pattern to detect the "function header" for HTML did
+   not match <H1>..<H6> elements without any attributes, which has
+   been fixed.
+
+ * "git mailinfo" was loose in decoding quoted printable and produced
+   garbage when the two letters after the equal sign are not
+   hexadecimal.  This has been fixed.
+
+ * The machinery to create xdelta used in pack files received the
+   sizes of the data in size_t, but lost the higher bits of them by
+   storing them in "unsigned int" during the computation, which is
+   fixed.
+
+ * The delta format used in the packfile cannot reference data at
+   offset larger than what can be expressed in 4-byte, but the
+   generator for the data failed to make sure the offset does not
+   overflow.  This has been corrected.
+
+ * The documentation for '-X<option>' for merges was misleadingly
+   written to suggest that "-s theirs" exists, which is not the case.
+
+ * "git fast-export" with -M/-C option issued "copy" instruction on a
+   path that is simultaneously modified, which was incorrect.
+   (merge b3e8ca89cf jt/fast-export-copy-modify-fix later to maint).
+
+ * Many codepaths have been updated to squelch -Wsign-compare
+   warnings.
+   (merge 071bcaab64 rj/no-sign-compare later to maint).
+
+ * Memory leaks in various codepaths have been plugged.
+   (merge 4d01a7fa65 ma/leakplugs later to maint).
+
+ * Recent versions of "git rev-parse --parseopt" did not parse the
+   option specification that does not have the optional flags (*=?!)
+   correctly, which has been corrected.
+   (merge a6304fa4c2 bc/rev-parse-parseopt-fix later to maint).
+
+ * The checkpoint command "git fast-import" did not flush updates to
+   refs and marks unless at least one object was created since the
+   last checkpoint, which has been corrected, as these things can
+   happen without any new object getting created.
+   (merge 30e215a65c er/fast-import-dump-refs-on-checkpoint later to maint).
+
+ * Spell the name of our system as "Git" in the output from
+   request-pull script.
+
+ * Fixes for a handful memory access issues identified by valgrind.
+
+ * Backports a moral equivalent of 2015 fix to the poll() emulation
+   from the upstream gnulib to fix occasional breakages on HPE NonStop.
+
+ * Users with "color.ui = always" in their configuration were broken
+   by a recent change that made plumbing commands to pay attention to
+   them as the patch created internally by "git add -p" were colored
+   (heh) and made unusable.  This has been fixed by reverting the
+   offending change.
+
+ * In the "--format=..." option of the "git for-each-ref" command (and
+   its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)"
+   (e.g. "%(refname:)", "%(body:)" used to error out.  Instead, treat
+   them as if the colon and an empty string that follows it were not
+   there.
+
+ * An ancient bug that made Git misbehave with creation/renaming of
+   refs has been fixed.
+
+ * "git fetch <there> <src>:<dst>" allows an object name on the <src>
+   side when the other side accepts such a request since Git v2.5, but
+   the documentation was left stale.
+   (merge 83558a412a jc/fetch-refspec-doc-update later to maint).
+
+ * Update the documentation for "git filter-branch" so that the filter
+   options are listed in the same order as they are applied, as
+   described in an earlier part of the doc.
+   (merge 07c4984508 dg/filter-branch-filter-order-doc later to maint).
+
+ * Other minor doc, test and build updates and code cleanups.
+   (merge f094b89a4d ma/parse-maybe-bool later to maint).
+   (merge 6cdf8a7929 ma/ts-cleanups later to maint).
+   (merge 7560f547e6 ma/up-to-date later to maint).
+   (merge 0db3dc75f3 rs/apply-epoch later to maint).
+   (merge 276d0e35c0 ma/split-symref-update-fix later to maint).
+   (merge f777623514 ks/branch-tweak-error-message-for-extra-args later to maint).
+   (merge 33f3c683ec ks/verify-filename-non-option-error-message-tweak later to maint).
+   (merge 7cbbf9d6a2 ls/filter-process-delayed later to maint).
+   (merge 488aa65c8f wk/merge-options-gpg-sign-doc later to maint).
+   (merge e61cb19a27 jc/branch-force-doc-readability-fix later to maint).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2271809d9..1ac0ae6ad 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -776,6 +776,12 @@ core.commentChar::
 If set to "auto", `git-commit` would select a character that is not
 the beginning character of any line in existing commit messages.
 
+core.filesRefLockTimeout::
+	The length of time, in milliseconds, to retry when trying to
+	lock an individual reference. Value 0 means not to retry at
+	all; -1 means to try indefinitely. Default is 100 (i.e.,
+	retry for 100ms).
+
 core.packedRefsTimeout::
 	The length of time, in milliseconds, to retry when trying to
 	lock the `packed-refs` file. Value 0 means not to retry at
@@ -1077,14 +1083,25 @@ This does not affect linkgit:git-format-patch[1] or the
 'git-diff-{asterisk}' plumbing commands.  Can be overridden on the
 command line with the `--color[=<when>]` option.
 
+diff.colorMoved::
+	If set to either a valid `<mode>` or a true value, moved lines
+	in a diff are colored differently, for details of valid modes
+	see '--color-moved' in linkgit:git-diff[1]. If simply set to
+	true the default color mode will be used. When set to false,
+	moved lines are not colored.
+
 color.diff.<slot>::
 	Use customized color for diff colorization.  `<slot>` specifies
 	which part of the patch to use the specified color, and is one
 	of `context` (context text - `plain` is a historical synonym),
 	`meta` (metainformation), `frag`
 	(hunk header), 'func' (function in hunk header), `old` (removed lines),
-	`new` (added lines), `commit` (commit headers), or `whitespace`
-	(highlighting whitespace errors).
+	`new` (added lines), `commit` (commit headers), `whitespace`
+	(highlighting whitespace errors), `oldMoved` (deleted lines),
+	`newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`,
+	`oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative`
+	and `newMovedAlternativeDimmed` (See the '<mode>'
+	setting of '--color-moved' in linkgit:git-diff[1] for details).
 
 color.decorate.<slot>::
 	Use customized color for 'git log --decorate' output.  `<slot>` is one
@@ -1553,11 +1570,13 @@ gc.<pattern>.reflogExpireUnreachable::
 gc.rerereResolved::
 	Records of conflicted merge you resolved earlier are
 	kept for this many days when 'git rerere gc' is run.
+	You can also use more human-readable "1.month.ago", etc.
 	The default is 60 days.  See linkgit:git-rerere[1].
 
 gc.rerereUnresolved::
 	Records of conflicted merge you have not resolved are
 	kept for this many days when 'git rerere gc' is run.
+	You can also use more human-readable "1.month.ago", etc.
 	The default is 15 days.  See linkgit:git-rerere[1].
 
 gitcvs.commitMsgAnnotation::
@@ -3066,10 +3085,14 @@ submodule.<name>.url::
 	See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
 
 submodule.<name>.update::
-	The default update procedure for a submodule. This variable
-	is populated by `git submodule init` from the
-	linkgit:gitmodules[5] file. See description of 'update'
-	command in linkgit:git-submodule[1].
+	The method by which a submodule is updated by 'git submodule update',
+	which is the only affected command, others such as
+	'git checkout --recurse-submodules' are unaffected. It exists for
+	historical reasons, when 'git submodule' was the only command to
+	interact with submodules; settings like `submodule.active`
+	and `pull.rebase` are more specific. It is populated by
+	`git submodule init` from the linkgit:gitmodules[5] file.
+	See description of 'update' command in linkgit:git-submodule[1].
 
 submodule.<name>.branch::
 	The remote branch name for a submodule, used by `git submodule
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 56dedafcd..a88c76741 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -231,6 +231,40 @@ ifdef::git-diff[]
 endif::git-diff[]
 	It is the same as `--color=never`.
 
+--color-moved[=<mode>]::
+	Moved lines of code are colored differently.
+ifdef::git-diff[]
+	It can be changed by the `diff.colorMoved` configuration setting.
+endif::git-diff[]
+	The <mode> defaults to 'no' if the option is not given
+	and to 'zebra' if the option with no mode is given.
+	The mode must be one of:
++
+--
+no::
+	Moved lines are not highlighted.
+default::
+	Is a synonym for `zebra`. This may change to a more sensible mode
+	in the future.
+plain::
+	Any line that is added in one location and was removed
+	in another location will be colored with 'color.diff.newMoved'.
+	Similarly 'color.diff.oldMoved' will be used for removed lines
+	that are added somewhere else in the diff. This mode picks up any
+	moved line, but it is not very useful in a review to determine
+	if a block of code was moved without permutation.
+zebra::
+	Blocks of moved text of at least 20 alphanumeric characters
+	are detected greedily. The detected blocks are
+	painted using either the 'color.diff.{old,new}Moved' color or
+	'color.diff.{old,new}MovedAlternative'. The change between
+	the two colors indicates that a new block was detected.
+dimmed_zebra::
+	Similar to 'zebra', but additional dimming of uninteresting parts
+	of moved code is performed. The bordering lines of two adjacent
+	blocks are considered interesting, the rest is uninteresting.
+--
+
 --word-diff[=<mode>]::
 	Show a word diff, using the <mode> to delimit changed words.
 	By default, words are delimited by whitespace; see
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 631cbd840..4ebc3d327 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -66,7 +66,7 @@ OPTIONS
 	disables it is in effect), make sure the patch is
 	applicable to what the current index file records.  If
 	the file to be patched in the working tree is not
-	up-to-date, it is flagged as an error.  This flag also
+	up to date, it is flagged as an error.  This flag also
 	causes the index file to be updated.
 
 --cached::
@@ -259,7 +259,7 @@ treats these changes as follows.
 If `--index` is specified (explicitly or implicitly), then the submodule
 commits must match the index exactly for the patch to apply.  If any
 of the submodules are checked-out, then these check-outs are completely
-ignored, i.e., they are not required to be up-to-date or clean and they
+ignored, i.e., they are not required to be up to date or clean and they
 are not updated.
 
 If `--index` is not specified, then the submodule commits in the patch
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 7463dc44a..d6587c5e9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -18,6 +18,7 @@ SYNOPSIS
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
+'git branch' (-c | -C) [<oldbranch>] <newbranch>
 'git branch' (-d | -D) [-r] <branchname>...
 'git branch' --edit-description [<branchname>]
 
@@ -64,6 +65,10 @@ If <oldbranch> had a corresponding reflog, it is renamed to match
 renaming. If <newbranch> exists, -M must be used to force the rename
 to happen.
 
+The `-c` and `-C` options have the exact same semantics as `-m` and
+`-M`, except instead of the branch being renamed it along with its
+config and reflog will be copied to a new name.
+
 With a `-d` or `-D` option, `<branchname>` will be deleted.  You may
 specify more than one branch for deletion.  If the branch currently
 has a reflog then the reflog will also be deleted.
@@ -99,12 +104,12 @@ OPTIONS
 
 -f::
 --force::
-	Reset <branchname> to <startpoint> if <branchname> exists
-	already. Without `-f` 'git branch' refuses to change an existing branch.
+	Reset <branchname> to <startpoint>, even if <branchname> exists
+	already. Without `-f`, 'git branch' refuses to change an existing branch.
 	In combination with `-d` (or `--delete`), allow deleting the
 	branch irrespective of its merged status. In combination with
 	`-m` (or `--move`), allow renaming the branch even if the new
-	branch name already exists.
+	branch name already exists, the same applies for `-c` (or `--copy`).
 
 -m::
 --move::
@@ -113,6 +118,13 @@ OPTIONS
 -M::
 	Shortcut for `--move --force`.
 
+-c::
+--copy::
+	Copy a branch and the corresponding reflog.
+
+-C::
+	Shortcut for `--copy --force`.
+
 --color[=<when>]::
 	Color branches to highlight current, local, and
 	remote-tracking branches.
@@ -195,10 +207,8 @@ start-point is either a local or remote-tracking branch.
 	branch.autoSetupMerge configuration variable is true.
 
 --set-upstream::
-	If specified branch does not exist yet or if `--force` has been
-	given, acts exactly like `--track`. Otherwise sets up configuration
-	like `--track` would when creating the branch, except that where
-	branch points to is not changed.
+	As this option had confusing syntax, it is no longer supported.
+	Please use `--track` or `--set-upstream-to` instead.
 
 -u <upstream>::
 --set-upstream-to=<upstream>::
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index a336ae5f6..ba90066f1 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -223,7 +223,7 @@ access method and requested operation.
 That means that even if you offer only read access (e.g. by using
 the pserver method), 'git-cvsserver' should have write access to
 the database to work reliably (otherwise you need to make sure
-that the database is up-to-date any time 'git-cvsserver' is executed).
+that the database is up to date any time 'git-cvsserver' is executed).
 
 By default it uses SQLite databases in the Git directory, named
 `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 26f19d3b0..c924c945b 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -87,19 +87,23 @@ OPTIONS
 
 --match <pattern>::
 	Only consider tags matching the given `glob(7)` pattern,
-	excluding the "refs/tags/" prefix.  This can be used to avoid
-	leaking private tags from the repository. If given multiple times, a
-	list of patterns will be accumulated, and tags matching any of the
-	patterns will be considered. Use `--no-match` to clear and reset the
-	list of patterns.
+	excluding the "refs/tags/" prefix. If used with `--all`, it also
+	considers local branches and remote-tracking references matching the
+	pattern, excluding respectively "refs/heads/" and "refs/remotes/"
+	prefix; references of other types are never considered. If given
+	multiple times, a list of patterns will be accumulated, and tags
+	matching any of the patterns will be considered.  Use `--no-match` to
+	clear and reset the list of patterns.
 
 --exclude <pattern>::
 	Do not consider tags matching the given `glob(7)` pattern, excluding
-	the "refs/tags/" prefix. This can be used to narrow the tag space and
-	find only tags matching some meaningful criteria. If given multiple
-	times, a list of patterns will be accumulated and tags matching any
-	of the patterns will be excluded. When combined with --match a tag will
-	be considered when it matches at least one --match pattern and does not
+	the "refs/tags/" prefix. If used with `--all`, it also does not consider
+	local branches and remote-tracking references matching the pattern,
+	excluding respectively "refs/heads/" and "refs/remotes/" prefix;
+	references of other types are never considered. If given multiple times,
+	a list of patterns will be accumulated and tags matching any of the
+	patterns will be excluded. When combined with --match a tag will be
+	considered when it matches at least one --match pattern and does not
 	match any of the --exclude patterns. Use `--no-exclude` to clear and
 	reset the list of patterns.
 
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index a17150695..b38067771 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -85,7 +85,7 @@ a 'git write-tree' + 'git diff-tree'. Thus that's the default mode.
 The non-cached version asks the question:
 
   show me the differences between HEAD and the currently checked out
-  tree - index contents _and_ files that aren't up-to-date
+  tree - index contents _and_ files that aren't up to date
 
 which is obviously a very useful question too, since that tells you what
 you *could* commit. Again, the output matches the 'git diff-tree -r'
@@ -100,8 +100,8 @@ have not actually done a 'git update-index' on it yet - there is no
   torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
   :100644 100664 7476bb... 000000...      kernel/sched.c
 
-i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
-not up-to-date and may contain new stuff. The all-zero sha1 means that to
+i.e., it shows that the tree has changed, and that `kernel/sched.c` is
+not up to date and may contain new stuff. The all-zero sha1 means that to
 get the real diff, you need to look at the object in the working directory
 directly rather than do an object-to-object diff.
 
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 9e5169aa6..3a52e4dce 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -8,13 +8,13 @@ git-filter-branch - Rewrite branches
 SYNOPSIS
 --------
 [verse]
-'git filter-branch' [--setup <command>] [--env-filter <command>]
-	[--tree-filter <command>] [--index-filter <command>]
-	[--parent-filter <command>] [--msg-filter <command>]
-	[--commit-filter <command>] [--tag-name-filter <command>]
-	[--subdirectory-filter <directory>] [--prune-empty]
+'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]
+	[--env-filter <command>] [--tree-filter <command>]
+	[--index-filter <command>] [--parent-filter <command>]
+	[--msg-filter <command>] [--commit-filter <command>]
+	[--tag-name-filter <command>] [--prune-empty]
 	[--original <namespace>] [-d <directory>] [-f | --force]
-	[--] [<rev-list options>...]
+	[--state-branch <branch>] [--] [<rev-list options>...]
 
 DESCRIPTION
 -----------
@@ -89,6 +89,11 @@ OPTIONS
 	can be used or modified in the following filter steps except
 	the commit filter, for technical reasons.
 
+--subdirectory-filter <directory>::
+	Only look at the history which touches the given subdirectory.
+	The result will contain that directory (and only that) as its
+	project root. Implies <<Remap_to_ancestor>>.
+
 --env-filter <command>::
 	This filter may be used if you only need to modify the environment
 	in which the commit will be performed.  Specifically, you might
@@ -167,11 +172,6 @@ be removed, buyer beware. There is also no support for changing the
 author or timestamp (or the tag message for that matter). Tags which point
 to other tags will be rewritten to point to the underlying commit.
 
---subdirectory-filter <directory>::
-	Only look at the history which touches the given subdirectory.
-	The result will contain that directory (and only that) as its
-	project root. Implies <<Remap_to_ancestor>>.
-
 --prune-empty::
 	Some filters will generate empty commits that leave the tree untouched.
 	This option instructs git-filter-branch to remove such commits if they
@@ -198,6 +198,12 @@ to other tags will be rewritten to point to the underlying commit.
 	directory or when there are already refs starting with
 	'refs/original/', unless forced.
 
+--state-branch <branch>::
+	This option will cause the mapping from old to new objects to
+	be loaded from named branch upon startup and saved as a new
+	commit to that branch upon exit, enabling incremental of large
+	trees. If '<branch>' does not exist it will be created.
+
 <rev-list options>...::
 	Arguments for 'git rev-list'.  All positive refs included by
 	these options are rewritten.  You may also specify options
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index cbd0a6212..1d420e4cd 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -218,11 +218,15 @@ and `date` to extract the named component.
 The complete message in a commit and tag object is `contents`.
 Its first line is `contents:subject`, where subject is the concatenation
 of all lines of the commit message up to the first blank line.  The next
-line is 'contents:body', where body is all of the lines after the first
+line is `contents:body`, where body is all of the lines after the first
 blank line.  The optional GPG signature is `contents:signature`.  The
 first `N` lines of the message is obtained using `contents:lines=N`.
 Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1]
-are obtained as 'contents:trailers'.
+are obtained as `trailers` (or by using the historical alias
+`contents:trailers`).  Non-trailer lines from the trailer block can be omitted
+with `trailers:only`. Whitespace-continuations can be removed from trailers so
+that each trailer appears on a line by itself with its full content with
+`trailers:unfold`. Both can be used together as `trailers:unfold,only`.
 
 For sorting purposes, fields with numeric values sort in numeric order
 (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c890328b0..6cbe462a7 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -23,6 +23,7 @@ SYNOPSIS
 		   [(--reroll-count|-v) <n>]
 		   [--to=<email>] [--cc=<email>]
 		   [--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+		   [--progress]
 		   [<common diff options>]
 		   [ <since> | <revision range> ]
 
@@ -283,6 +284,9 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
 	range are always formatted as creation patches, independently
 	of this flag.
 
+--progress::
+	Show progress reports on stderr as patches are generated.
+
 CONFIGURATION
 -------------
 You can specify extra mail header lines to be added to each message,
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 5edb1da46..18b494731 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -95,13 +95,6 @@ OPTIONS
 	<tree> option the prefix of all submodule output will be the name of
 	the parent project's <tree> object.
 
---parent-basename <basename>::
-	For internal use only.  In order to produce uniform output with the
-	--recurse-submodules option, this option can be used to provide the
-	basename of a parent's <tree> object to a submodule so the submodule
-	can prefix its output with the parent's name rather than the SHA1 of
-	the submodule.
-
 -a::
 --text::
 	Process binary files as if they were text.
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 31cdeaecd..9dd19a1dd 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -3,24 +3,27 @@ git-interpret-trailers(1)
 
 NAME
 ----
-git-interpret-trailers - help add structured information into commit messages
+git-interpret-trailers - add or parse structured information in commit messages
 
 SYNOPSIS
 --------
 [verse]
-'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]
+'git interpret-trailers' [options] [(--trailer <token>[(=|:)<value>])...] [<file>...]
+'git interpret-trailers' [options] [--parse] [<file>...]
 
 DESCRIPTION
 -----------
-Help adding 'trailers' lines, that look similar to RFC 822 e-mail
+Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail
 headers, at the end of the otherwise free-form part of a commit
 message.
 
 This command reads some patches or commit messages from either the
-<file> arguments or the standard input if no <file> is specified. Then
-this command applies the arguments passed using the `--trailer`
-option, if any, to the commit message part of each input file. The
-result is emitted on the standard output.
+<file> arguments or the standard input if no <file> is specified. If
+`--parse` is specified, the output consists of the parsed trailers.
+
+Otherwise, this command applies the arguments passed using the
+`--trailer` option, if any, to the commit message part of each input
+file. The result is emitted on the standard output.
 
 Some configuration variables control the way the `--trailer` arguments
 are applied to each commit message and the way any existing trailer in
@@ -80,6 +83,45 @@ OPTIONS
 	trailer to the input messages. See the description of this
 	command.
 
+--where <placement>::
+--no-where::
+	Specify where all new trailers will be added.  A setting
+	provided with '--where' overrides all configuration variables
+	and applies to all '--trailer' options until the next occurrence of
+	'--where' or '--no-where'.
+
+--if-exists <action>::
+--no-if-exists::
+	Specify what action will be performed when there is already at
+	least one trailer with the same <token> in the message.  A setting
+	provided with '--if-exists' overrides all configuration variables
+	and applies to all '--trailer' options until the next occurrence of
+	'--if-exists' or '--no-if-exists'.
+
+--if-missing <action>::
+--no-if-missing::
+	Specify what action will be performed when there is no other
+	trailer with the same <token> in the message.  A setting
+	provided with '--if-missing' overrides all configuration variables
+	and applies to all '--trailer' options until the next occurrence of
+	'--if-missing' or '--no-if-missing'.
+
+--only-trailers::
+	Output only the trailers, not any other parts of the input.
+
+--only-input::
+	Output only trailers that exist in the input; do not add any
+	from the command-line or by following configured `trailer.*`
+	rules.
+
+--unfold::
+	Remove any whitespace-continuation in trailers, so that each
+	trailer appears on a line by itself with its full content.
+
+--parse::
+	A convenience alias for `--only-trailers --only-input
+	--unfold`.
+
 CONFIGURATION VARIABLES
 -----------------------
 
@@ -170,8 +212,8 @@ trailer.<token>.where::
 	configuration variable and it overrides what is specified by
 	that option for trailers with the specified <token>.
 
-trailer.<token>.ifexist::
-	This option takes the same values as the 'trailer.ifexist'
+trailer.<token>.ifexists::
+	This option takes the same values as the 'trailer.ifexists'
 	configuration variable and it overrides what is specified by
 	that option for trailers with the specified <token>.
 
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f90faf7aa..3c6927b1f 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,11 +64,13 @@ OPTIONS
 -------
 include::merge-options.txt[]
 
--S[<keyid>]::
---gpg-sign[=<keyid>]::
-	GPG-sign the resulting merge commit. The `keyid` argument is
-	optional and defaults to the committer identity; if specified,
-	it must be stuck to the option without a space.
+--signoff::
+	Add Signed-off-by line by the committer at the end of the commit
+	log message.  The meaning of a signoff depends on the project,
+	but it typically certifies that committer has
+	the rights to submit this work under the same license and
+	agrees to a Developer Certificate of Origin
+	(see http://developercertificate.org/ for more information).
 
 -m <msg>::
 	Set the commit message to be used for the merge commit (in
@@ -133,7 +135,7 @@ exception is when the changed index entries are in the state that
 would result from the merge already.)
 
 If all named commits are already ancestors of `HEAD`, 'git merge'
-will exit early with the message "Already up-to-date."
+will exit early with the message "Already up to date."
 
 FAST-FORWARD MERGE
 ------------------
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 0a639664f..3e76e99f3 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 	   [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
 	   [-u | --set-upstream] [--push-option=<string>]
-	   [--[no-]signed|--sign=(true|false|if-asked)]
+	   [--[no-]signed|--signed=(true|false|if-asked)]
 	   [--force-with-lease[=<refname>[:<expect>]]]
 	   [--no-verify] [<repository> [<refspec>...]]
 
@@ -141,7 +141,7 @@ already exists on the remote side.
 	information, see `push.followTags` in linkgit:git-config[1].
 
 --[no-]signed::
---sign=(true|false|if-asked)::
+--signed=(true|false|if-asked)::
 	GPG-sign the push request to update refs on the receiving
 	side, to allow it to be checked by the hooks and/or be
 	logged.  If `false` or `--no-signed`, no signing will be
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4f6bed61a..3cedfb0fd 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -334,7 +334,7 @@ which makes little sense.
 
 -f::
 --force-rebase::
-	Force a rebase even if the current branch is up-to-date and
+	Force a rebase even if the current branch is up to date and
 	the command without `--force` would return without doing anything.
 +
 You may find this (or --no-ff with an interactive rebase) helpful after
@@ -430,13 +430,15 @@ without an explicit `--interactive`.
 --autosquash::
 --no-autosquash::
 	When the commit log message begins with "squash! ..." (or
-	"fixup! ..."), and there is a commit whose title begins with
-	the same ..., automatically modify the todo list of rebase -i
-	so that the commit marked for squashing comes right after the
-	commit to be modified, and change the action of the moved
-	commit from `pick` to `squash` (or `fixup`).  Ignores subsequent
-	"fixup! " or "squash! " after the first, in case you referred to an
-	earlier fixup/squash with `git commit --fixup/--squash`.
+	"fixup! ..."), and there is already a commit in the todo list that
+	matches the same `...`, automatically modify the todo list of rebase
+	-i so that the commit marked for squashing comes right after the
+	commit to be modified, and change the action of the moved commit
+	from `pick` to `squash` (or `fixup`).  A commit matches the `...` if
+	the commit subject matches, or if the `...` refers to the commit's
+	hash. As a fall-back, partial matches of the commit subject work,
+	too.  The recommended way to create fixup/squash commits is by using
+	the `--fixup`/`--squash` options of linkgit:git-commit[1].
 +
 This option is only valid when the `--interactive` option is used.
 +
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 9ee083c41..031f31fa4 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -205,7 +205,7 @@ development on the topic branch:
 ------------
 
 you could run `git rebase master topic`, to bring yourself
-up-to-date before your topic is ready to be sent upstream.
+up to date before your topic is ready to be sent upstream.
 This would result in falling back to a three-way merge, and it
 would conflict the same way as the test merge you resolved earlier.
 'git rerere' will be run by 'git rebase' to help you resolve this
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index b1293f24b..0917b8207 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -235,6 +235,9 @@ print a message to stderr and exit with nonzero status.
 --is-bare-repository::
 	When the repository is bare print "true", otherwise "false".
 
+--is-shallow-repository::
+	When the repository is shallow print "true", otherwise "false".
+
 --resolve-git-dir <path>::
 	Check if <path> is a valid repository or a gitfile that
 	points at a valid repository, and print the location of the
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 683e59133..b5c46223c 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -146,7 +146,7 @@ the submodule's history. If it exists the submodule.<name> section
 in the linkgit:gitmodules[5] file will also be removed and that file
 will be staged (unless --cached or -n are used).
 
-A submodule is considered up-to-date when the HEAD is the same as
+A submodule is considered up to date when the HEAD is the same as
 recorded in the index, no tracked files are modified and no untracked
 files that aren't ignored are present in the submodules work tree.
 Ignored files are deemed expendable and won't stop a submodule's work
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 966abb0df..f51c64939 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
 		[--verbose] [--thin] [--atomic]
-		[--[no-]signed|--sign=(true|false|if-asked)]
+		[--[no-]signed|--signed=(true|false|if-asked)]
 		[<host>:]<directory> [<ref>...]
 
 DESCRIPTION
@@ -71,7 +71,7 @@ be in a separate packet, and the list must end with a flush packet.
 	refs.
 
 --[no-]signed::
---sign=(true|false|if-asked)::
+--signed=(true|false|if-asked)::
 	GPG-sign the push request to update refs on the receiving
 	side, to allow it to be checked by the hooks and/or be
 	logged.  If `false` or `--no-signed`, no signing will be
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index aa2aeabb6..636e09048 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -424,7 +424,7 @@ Any other arguments are passed directly to 'git log'
 'set-tree'::
 	You should consider using 'dcommit' instead of this command.
 	Commit specified commit or tree objects to SVN.  This relies on
-	your imported fetch data being up-to-date.  This makes
+	your imported fetch data being up to date.  This makes
 	absolutely no attempts to do patching when committing to SVN, it
 	simply overwrites files with those specified in the tree or
 	commit.  All merging is assumed to have taken place
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index a14e6aebd..75c7dd9de 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -214,7 +214,7 @@ will remove the intended effect of the option.
 Using --refresh
 ---------------
 `--refresh` does not calculate a new sha1 file or bring the index
-up-to-date for mode/content changes. But what it *does* do is to
+up to date for mode/content changes. But what it *does* do is to
 "re-match" the stat information of a file with the index, so that you
 can refresh the index for a file that hasn't been changed but where
 the stat entry is out of date.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98b9b46b9..7a1d629ca 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -159,6 +159,10 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
 	Add "icase" magic to all pathspec. This is equivalent to setting
 	the `GIT_ICASE_PATHSPECS` environment variable to `1`.
 
+--no-optional-locks::
+	Do not perform optional operations that require locks. This is
+	equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`.
+
 GIT COMMANDS
 ------------
 
@@ -697,6 +701,14 @@ of clones and fetches.
 	which feed potentially-untrusted URLS to git commands.  See
 	linkgit:git-config[1] for more details.
 
+`GIT_OPTIONAL_LOCKS`::
+	If set to `0`, Git will complete any requested operation without
+	performing any optional sub-operations that require taking a lock.
+	For example, this will prevent `git status` from refreshing the
+	index as a side effect. This is useful for processes running in
+	the background which do not want to cause lock contention with
+	other operations on the repository.  Defaults to `1`.
+
 Discussion[[Discussion]]
 ------------------------
 
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 7577f27ec..e29a9effc 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -631,7 +631,7 @@ So after you do a `cp -a` to create a new copy, you'll want to do
 $ git update-index --refresh
 ----------------
 +
-in the new repository to make sure that the index file is up-to-date.
+in the new repository to make sure that the index file is up to date.
 
 Note that the second point is true even across machines. You can
 duplicate a remote Git repository with *any* regular copy mechanism, be it
@@ -701,7 +701,7 @@ $ git checkout-index -u -a
 ----------------
 
 where the `-u` flag means that you want the checkout to keep the index
-up-to-date (so that you don't have to refresh it afterward), and the
+up to date (so that you don't have to refresh it afterward), and the
 `-a` flag means "check out all files" (if you have a stale copy or an
 older version of a checked out tree you may also need to add the `-f`
 flag first, to tell 'git checkout-index' to *force* overwriting of any old
@@ -1283,7 +1283,7 @@ run a single command, 'git-receive-pack'.
 
 First, you need to create an empty repository on the remote
 machine that will house your public repository. This empty
-repository will be populated and be kept up-to-date by pushing
+repository will be populated and be kept up to date by pushing
 into it later. Obviously, this repository creation needs to be
 done only once.
 
@@ -1450,7 +1450,7 @@ transport protocols (HTTP), you need to keep this repository
 would contain a call to 'git update-server-info'
 but you need to manually enable the hook with
 `mv post-update.sample post-update`.  This makes sure
-'git update-server-info' keeps the necessary files up-to-date.
+'git update-server-info' keeps the necessary files up to date.
 
 3. Push into the public repository from your primary
    repository.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b2514f4d4..5d3f45560 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -121,17 +121,16 @@ it is not suppressed by the `--no-verify` option.  A non-zero exit
 means a failure of the hook and aborts the commit.  It should not
 be used as replacement for pre-commit hook.
 
-The sample `prepare-commit-msg` hook that comes with Git comments
-out the `Conflicts:` part of a merge's commit message.
+The sample `prepare-commit-msg` hook that comes with Git removes the
+help message found in the commented portion of the commit template.
 
 commit-msg
 ~~~~~~~~~~
 
-This hook is invoked by 'git commit', and can be bypassed
-with the `--no-verify` option.  It takes a single parameter, the
-name of the file that holds the proposed commit log message.
-Exiting with a non-zero status causes the 'git commit' to
-abort.
+This hook is invoked by 'git commit' and 'git merge', and can be
+bypassed with the `--no-verify` option.  It takes a single parameter,
+the name of the file that holds the proposed commit log message.
+Exiting with a non-zero status causes the command to abort.
 
 The hook is allowed to edit the message file in place, and can be used
 to normalize the message into some project standard format. It
@@ -369,7 +368,7 @@ them.
 
 When enabled, the default 'post-update' hook runs
 'git update-server-info' to keep the information used by dumb
-transports (e.g., HTTP) up-to-date.  If you are publishing
+transports (e.g., HTTP) up to date.  If you are publishing
 a Git repository that is accessible via HTTP, you should
 probably enable this hook.
 
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index f51ed4e37..adf9554ad 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -71,7 +71,7 @@ objects/info/packs::
 	This file is to help dumb transports discover what packs
 	are available in this object store.  Whenever a pack is
 	added or removed, `git update-server-info` should be run
-	to keep this file up-to-date if the repository is
+	to keep this file up to date if the repository is
 	published for dumb transports.  'git repack' does this
 	by default.
 
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 794b83393..242de31cb 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -109,7 +109,7 @@ summary of the situation with 'git status':
 $ git status
 On branch master
 Changes to be committed:
-Your branch is up-to-date with 'origin/master'.
+Your branch is up to date with 'origin/master'.
   (use "git reset HEAD <file>..." to unstage)
 
 	modified:   file1
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e93..2552ab8e8 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -39,9 +39,15 @@ set to `no` at the beginning of them.
 
 --ff-only::
 	Refuse to merge and exit with a non-zero status unless the
-	current `HEAD` is already up-to-date or the merge can be
+	current `HEAD` is already up to date or the merge can be
 	resolved as a fast-forward.
 
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+	GPG-sign the resulting merge commit. The `keyid` argument is
+	optional and defaults to the committer identity; if specified,
+	it must be stuck to the option without a space.
+
 --log[=<n>]::
 --no-log::
 	In addition to branch names, populate the log message with
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 973d19606..d433d50f8 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -205,7 +205,10 @@ endif::git-rev-list[]
 - '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
   respectively, but padding both sides (i.e. the text is centered)
 - %(trailers): display the trailers of the body as interpreted by
-  linkgit:git-interpret-trailers[1]
+  linkgit:git-interpret-trailers[1]. If the `:only` option is given,
+  omit non-trailer lines from the trailer block.  If the `:unfold`
+  option is given, behave as if interpret-trailer's `--unfold` option
+  was given. E.g., `%(trailers:only:unfold)` to do both.
 
 NOTE: Some placeholders may depend on other options given to the
 revision traversal engine. For example, the `%g*` reflog options will
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 1ebbf1d73..c579793af 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -23,9 +23,11 @@ ifdef::git-pull[]
 endif::git-pull[]
 +
 The format of a <refspec> parameter is an optional plus
-`+`, followed by the source ref <src>, followed
+`+`, followed by the source <src>, followed
 by a colon `:`, followed by the destination ref <dst>.
-The colon can be omitted when <dst> is empty.
+The colon can be omitted when <dst> is empty.  <src> is
+typically a ref, but it can also be a fully spelled hex object
+name.
 +
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
 it requests fetching everything up to the given tag.
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index a6cf9eb38..7d860bfca 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -184,6 +184,14 @@ explicitly.
 	Pretend as if all objects mentioned by reflogs are listed on the
 	command line as `<commit>`.
 
+--single-worktree::
+	By default, all working trees will be examined by the
+	following options when there are more than one (see
+	linkgit:git-worktree[1]): `--all`, `--reflog` and
+	`--indexed-objects`.
+	This option forces them to examine the current working tree
+	only.
+
 --ignore-missing::
 	Upon seeing an invalid object name in the input, pretend as if
 	the bad input was not given.
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
index cfc063018..870c8edbf 100644
--- a/Documentation/technical/api-argv-array.txt
+++ b/Documentation/technical/api-argv-array.txt
@@ -8,7 +8,7 @@ always NULL-terminated at the element pointed to by `argv[argc]`. This
 makes the result suitable for passing to functions expecting to receive
 argv from main(), or the link:api-run-command.html[run-command API].
 
-The link:api-string-list.html[string-list API] is similar, but cannot be
+The string-list API (documented in string-list.h) is similar, but cannot be
 used for these purposes; instead of storing a straight string pointer,
 it contains an item structure with a `util` field that is not compatible
 with the traditional argv interface.
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index 20741f345..9a778b0ca 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -186,7 +186,7 @@ parsing is successful, the return value is the result.
 Same as `git_config_bool`, except that integers are returned as-is, and
 an `is_bool` flag is unset.
 
-`git_config_maybe_bool`::
+`git_parse_maybe_bool`::
 Same as `git_config_bool`, except that it returns -1 on error rather
 than dying.
 
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index 37379d833..46c3d5c35 100644
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -32,11 +32,8 @@ Iteration functions
 
 * `for_each_glob_ref_in()` the previous and `for_each_ref_in()` combined.
 
-* `head_ref_submodule()`, `for_each_ref_submodule()`,
-  `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
-  `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
-  do the same as the functions described above but for a specified
-  submodule.
+* Use `refs_` API for accessing submodules. The submodule ref store could
+  be obtained with `get_submodule_ref_store()`.
 
 * `for_each_rawref()` can be used to learn about broken ref and symref.
 
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
deleted file mode 100644
index c08402b12..000000000
--- a/Documentation/technical/api-string-list.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-string-list API
-===============
-
-The string_list API offers a data structure and functions to handle
-sorted and unsorted string lists.  A "sorted" list is one whose
-entries are sorted by string value in `strcmp()` order.
-
-The 'string_list' struct used to be called 'path_list', but was renamed
-because it is not specific to paths.
-
-The caller:
-
-. Allocates and clears a `struct string_list` variable.
-
-. Initializes the members. You might want to set the flag `strdup_strings`
-  if the strings should be strdup()ed. For example, this is necessary
-  when you add something like git_path("..."), since that function returns
-  a static buffer that will change with the next call to git_path().
-+
-If you need something advanced, you can manually malloc() the `items`
-member (you need this if you add things later) and you should set the
-`nr` and `alloc` members in that case, too.
-
-. Adds new items to the list, using `string_list_append`,
-  `string_list_append_nodup`, `string_list_insert`,
-  `string_list_split`, and/or `string_list_split_in_place`.
-
-. Can check if a string is in the list using `string_list_has_string` or
-  `unsorted_string_list_has_string` and get it from the list using
-  `string_list_lookup` for sorted lists.
-
-. Can sort an unsorted list using `string_list_sort`.
-
-. Can remove duplicate items from a sorted list using
-  `string_list_remove_duplicates`.
-
-. Can remove individual items of an unsorted list using
-  `unsorted_string_list_delete_item`.
-
-. Can remove items not matching a criterion from a sorted or unsorted
-  list using `filter_string_list`, or remove empty strings using
-  `string_list_remove_empty_items`.
-
-. Finally it should free the list using `string_list_clear`.
-
-Example:
-
-----
-struct string_list list = STRING_LIST_INIT_NODUP;
-int i;
-
-string_list_append(&list, "foo");
-string_list_append(&list, "bar");
-for (i = 0; i < list.nr; i++)
-	printf("%s\n", list.items[i].string)
-----
-
-NOTE: It is more efficient to build an unsorted list and sort it
-afterwards, instead of building a sorted list (`O(n log n)` instead of
-`O(n^2)`).
-+
-However, if you use the list to check if a certain string was added
-already, you should not do that (using unsorted_string_list_has_string()),
-because the complexity would be quadratic again (but with a worse factor).
-
-Functions
----------
-
-* General ones (works with sorted and unsorted lists as well)
-
-`string_list_init`::
-
-	Initialize the members of the string_list, set `strdup_strings`
-	member according to the value of the second parameter.
-
-`filter_string_list`::
-
-	Apply a function to each item in a list, retaining only the
-	items for which the function returns true.  If free_util is
-	true, call free() on the util members of any items that have
-	to be deleted.  Preserve the order of the items that are
-	retained.
-
-`string_list_remove_empty_items`::
-
-	Remove any empty strings from the list.  If free_util is true,
-	call free() on the util members of any items that have to be
-	deleted.  Preserve the order of the items that are retained.
-
-`print_string_list`::
-
-	Dump a string_list to stdout, useful mainly for debugging purposes. It
-	can take an optional header argument and it writes out the
-	string-pointer pairs of the string_list, each one in its own line.
-
-`string_list_clear`::
-
-	Free a string_list. The `string` pointer of the items will be freed in
-	case the `strdup_strings` member of the string_list is set. The second
-	parameter controls if the `util` pointer of the items should be freed
-	or not.
-
-* Functions for sorted lists only
-
-`string_list_has_string`::
-
-	Determine if the string_list has a given string or not.
-
-`string_list_insert`::
-
-	Insert a new element to the string_list. The returned pointer can be
-	handy if you want to write something to the `util` pointer of the
-	string_list_item containing the just added string. If the given
-	string already exists the insertion will be skipped and the
-	pointer to the existing item returned.
-+
-Since this function uses xrealloc() (which die()s if it fails) if the
-list needs to grow, it is safe not to check the pointer. I.e. you may
-write `string_list_insert(...)->util = ...;`.
-
-`string_list_lookup`::
-
-	Look up a given string in the string_list, returning the containing
-	string_list_item. If the string is not found, NULL is returned.
-
-`string_list_remove_duplicates`::
-
-	Remove all but the first of consecutive entries that have the
-	same string value.  If free_util is true, call free() on the
-	util members of any items that have to be deleted.
-
-* Functions for unsorted lists only
-
-`string_list_append`::
-
-	Append a new string to the end of the string_list.  If
-	`strdup_string` is set, then the string argument is copied;
-	otherwise the new `string_list_entry` refers to the input
-	string.
-
-`string_list_append_nodup`::
-
-	Append a new string to the end of the string_list.  The new
-	`string_list_entry` always refers to the input string, even if
-	`strdup_string` is set.  This function can be used to hand
-	ownership of a malloc()ed string to a `string_list` that has
-	`strdup_string` set.
-
-`string_list_sort`::
-
-	Sort the list's entries by string value in `strcmp()` order.
-
-`unsorted_string_list_has_string`::
-
-	It's like `string_list_has_string()` but for unsorted lists.
-
-`unsorted_string_list_lookup`::
-
-	It's like `string_list_lookup()` but for unsorted lists.
-+
-The above two functions need to look through all items, as opposed to their
-counterpart for sorted lists, which performs a binary search.
-
-`unsorted_string_list_delete_item`::
-
-	Remove an item from a string_list. The `string` pointer of the items
-	will be freed in case the `strdup_strings` member of the string_list
-	is set. The third parameter controls if the `util` pointer of the
-	items should be freed or not.
-
-`string_list_split`::
-`string_list_split_in_place`::
-
-	Split a string into substrings on a delimiter character and
-	append the substrings to a `string_list`.  If `maxsplit` is
-	non-negative, then split at most `maxsplit` times.  Return the
-	number of substrings appended to the list.
-+
-`string_list_split` requires a `string_list` that has `strdup_strings`
-set to true; it leaves the input string untouched and makes copies of
-the substrings in newly-allocated memory.
-`string_list_split_in_place` requires a `string_list` that has
-`strdup_strings` set to false; it splits the input string in place,
-overwriting the delimiter characters with NULs and creating new
-string_list_items that point into the original string (the original
-string must therefore not be modified or freed while the `string_list`
-is in use).
-
-
-Data structures
----------------
-
-* `struct string_list_item`
-
-Represents an item of the list. The `string` member is a pointer to the
-string, and you may use the `util` member for any purpose, if you want.
-
-* `struct string_list`
-
-Represents the list itself.
-
-. The array of items are available via the `items` member.
-. The `nr` member contains the number of items stored in the list.
-. The `alloc` member is used to avoid reallocating at every insertion.
-  You should not tamper with it.
-. Setting the `strdup_strings` member to 1 will strdup() the strings
-  before adding them, see above.
-. The `compare_strings_fn` member is used to specify a custom compare
-  function, otherwise `strcmp()` is used as the default function.
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt
index 14af37c3f..bde18622a 100644
--- a/Documentation/technical/api-tree-walking.txt
+++ b/Documentation/technical/api-tree-walking.txt
@@ -55,9 +55,9 @@ Initializing
 
 `fill_tree_descriptor`::
 
-	Initialize a `tree_desc` and decode its first entry given the sha1 of
-	a tree. Returns the `buffer` member if the sha1 is a valid tree
-	identifier and NULL otherwise.
+	Initialize a `tree_desc` and decode its first entry given the
+	object ID of a tree. Returns the `buffer` member if the latter
+	is a valid tree identifier and NULL otherwise.
 
 `setup_traverse_info`::
 
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
new file mode 100644
index 000000000..417ba491d
--- /dev/null
+++ b/Documentation/technical/hash-function-transition.txt
@@ -0,0 +1,797 @@
+Git hash function transition
+============================
+
+Objective
+---------
+Migrate Git from SHA-1 to a stronger hash function.
+
+Background
+----------
+At its core, the Git version control system is a content addressable
+filesystem. It uses the SHA-1 hash function to name content. For
+example, files, directories, and revisions are referred to by hash
+values unlike in other traditional version control systems where files
+or versions are referred to via sequential numbers. The use of a hash
+function to address its content delivers a few advantages:
+
+* Integrity checking is easy. Bit flips, for example, are easily
+  detected, as the hash of corrupted content does not match its name.
+* Lookup of objects is fast.
+
+Using a cryptographically secure hash function brings additional
+advantages:
+
+* Object names can be signed and third parties can trust the hash to
+  address the signed object and all objects it references.
+* Communication using Git protocol and out of band communication
+  methods have a short reliable string that can be used to reliably
+  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.
+
+SHA-1 still possesses the other properties such as fast object lookup
+and safe error checking, but other hash functions are equally suitable
+that are believed to be cryptographically secure.
+
+Goals
+-----
+Where NewHash is a strong 256-bit hash function to replace SHA-1 (see
+"Selection of a New Hash", below):
+
+1. The transition to NewHash can be done one local repository at a time.
+   a. Requiring no action by any other party.
+   b. A NewHash repository can communicate with SHA-1 Git servers
+      (push/fetch).
+   c. Users can use SHA-1 and NewHash identifiers for objects
+      interchangeably (see "Object names on the command line", below).
+   d. New signed objects make use of a stronger hash function than
+      SHA-1 for their security guarantees.
+2. Allow a complete transition away from SHA-1.
+   a. Local metadata for SHA-1 compatibility can be removed from a
+      repository if compatibility with SHA-1 is no longer needed.
+3. Maintainability throughout the process.
+   a. The object format is kept simple and consistent.
+   b. Creation of a generalized repository conversion tool.
+
+Non-Goals
+---------
+1. Add NewHash support to Git protocol. This is valuable and the
+   logical next step but it is out of scope for this initial design.
+2. Transparently improving the security of existing SHA-1 signed
+   objects.
+3. Intermixing objects using multiple hash functions in a single
+   repository.
+4. Taking the opportunity to fix other bugs in Git's formats and
+   protocols.
+5. Shallow clones and fetches into a NewHash repository. (This will
+   change when we add NewHash support to Git protocol.)
+6. Skip fetching some submodules of a project into a NewHash
+   repository. (This also depends on NewHash support in Git
+   protocol.)
+
+Overview
+--------
+We introduce a new repository format extension. Repositories with this
+extension enabled use NewHash instead of SHA-1 to name their objects.
+This affects both object names and object content --- both the names
+of objects and all references to other objects within an object are
+switched to the new hash function.
+
+NewHash repositories cannot be read by older versions of Git.
+
+Alongside the packfile, a NewHash repository stores a bidirectional
+mapping between NewHash and SHA-1 object names. The mapping is generated
+locally and can be verified using "git fsck". Object lookups use this
+mapping to allow naming objects using either their SHA-1 and NewHash names
+interchangeably.
+
+"git cat-file" and "git hash-object" gain options to display an object
+in its sha1 form and write an object given its sha1 form. This
+requires all objects referenced by that object to be present in the
+object database so that they can be named using the appropriate name
+(using the bidirectional hash mapping).
+
+Fetches from a SHA-1 based server convert the fetched objects into
+NewHash form and record the mapping in the bidirectional mapping table
+(see below for details). Pushes to a SHA-1 based server convert the
+objects being pushed into sha1 form so the server does not have to be
+aware of the hash function the client is using.
+
+Detailed Design
+---------------
+Repository format extension
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+A NewHash repository uses repository format version `1` (see
+Documentation/technical/repository-version.txt) with extensions
+`objectFormat` and `compatObjectFormat`:
+
+	[core]
+		repositoryFormatVersion = 1
+	[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:
+
+	$ git status
+	fatal: unknown repository extensions found:
+		objectformat
+		compatobjectformat
+
+See the "Transition plan" section below for more details on these
+repository extensions.
+
+Object names
+~~~~~~~~~~~~
+Objects can be named by their 40 hexadecimal digit sha1-name or 64
+hexadecimal digit newhash-name, plus names derived from those (see
+gitrevisions(7)).
+
+The sha1-name of an object is the SHA-1 of the concatenation of its
+type, length, a nul byte, and the object's sha1-content. This is the
+traditional <sha1> used in Git to name objects.
+
+The newhash-name of an object is the NewHash of the concatenation of its
+type, length, a nul byte, and the object's newhash-content.
+
+Object format
+~~~~~~~~~~~~~
+The content as a byte sequence of a tag, commit, or tree object named
+by sha1 and newhash differ because an object named by newhash-name refers to
+other objects by their newhash-names and an object named by sha1-name
+refers to other objects by their sha1-names.
+
+The newhash-content of an object is the same as its sha1-content, except
+that objects referenced by the object are named using their newhash-names
+instead of sha1-names. Because a blob object does not refer to any
+other object, its sha1-content and newhash-content are the same.
+
+The format allows round-trip conversion between newhash-content and
+sha1-content.
+
+Object storage
+~~~~~~~~~~~~~~
+Loose objects use zlib compression and packed objects use the packed
+format described in Documentation/technical/pack-format.txt, just like
+today. The content that is compressed and stored uses newhash-content
+instead of sha1-content.
+
+Pack index
+~~~~~~~~~~
+Pack index (.idx) files use a new v3 format that supports multiple
+hash functions. They have the following format (all integers are in
+network byte order):
+
+- A header appears at the beginning and consists of the following:
+  - The 4-byte pack index signature: '\377t0c'
+  - 4-byte version number: 3
+  - 4-byte length of the header section, including the signature and
+    version number
+  - 4-byte number of objects contained in the pack
+  - 4-byte number of object formats in this pack index: 2
+  - For each object format:
+    - 4-byte format identifier (e.g., 'sha1' for SHA-1)
+    - 4-byte length in bytes of shortened object names. This is the
+      shortest possible length needed to make names in the shortened
+      object name table unambiguous.
+    - 4-byte integer, recording where tables relating to this format
+      are stored in this index file, as an offset from the beginning.
+  - 4-byte offset to the trailer from the beginning of this file.
+  - Zero or more additional key/value pairs (4-byte key, 4-byte
+    value). Only one key is supported: 'PSRC'. See the "Loose objects
+    and unreachable objects" section for supported values and how this
+    is used.  All other keys are reserved. Readers must ignore
+    unrecognized keys.
+- Zero or more NUL bytes. This can optionally be used to improve the
+  alignment of the full object name table below.
+- Tables for the first object format:
+  - A sorted table of shortened object names.  These are prefixes of
+    the names of all objects in this pack file, packed together
+    without offset values to reduce the cache footprint of the binary
+    search for a specific object name.
+
+  - A table of full object names in pack order. This allows resolving
+    a reference to "the nth object in the pack file" (from a
+    reachability bitmap or from the next table of another object
+    format) to its object name.
+
+  - A table of 4-byte values mapping object name order to pack order.
+    For an object in the table of sorted shortened object names, the
+    value at the corresponding index in this table is the index in the
+    previous table for that same object.
+
+    This can be used to look up the object in reachability bitmaps or
+    to look up its name in another object format.
+
+  - A table of 4-byte CRC32 values of the packed object data, in the
+    order that the objects appear in the pack file. This is to allow
+    compressed data to be copied directly from pack to pack during
+    repacking without undetected data corruption.
+
+  - A table of 4-byte offset values. For an object in the table of
+    sorted shortened object names, the value at the corresponding
+    index in this table indicates where that object can be found in
+    the pack file. These are usually 31-bit pack file offsets, but
+    large offsets are encoded as an index into the next table with the
+    most significant bit set.
+
+  - A table of 8-byte offset entries (empty for pack files less than
+    2 GiB). Pack files are organized with heavily used objects toward
+    the front, so most object references should not need to refer to
+    this table.
+- Zero or more NUL bytes.
+- Tables for the second object format, with the same layout as above,
+  up to and not including the table of CRC32 values.
+- Zero or more NUL bytes.
+- The trailer consists of the following:
+  - A copy of the 20-byte NewHash checksum at the end of the
+    corresponding packfile.
+
+  - 20-byte NewHash checksum of all of the above.
+
+Loose object index
+~~~~~~~~~~~~~~~~~~
+A new file $GIT_OBJECT_DIR/loose-object-idx contains information about
+all loose objects. Its format is
+
+  # loose-object-idx
+  (newhash-name SP sha1-name LF)*
+
+where the object names are in hexadecimal format. The file is not
+sorted.
+
+The loose object index is protected against concurrent writes by a
+lock file $GIT_OBJECT_DIR/loose-object-idx.lock. To add a new loose
+object:
+
+1. Write the loose object to a temporary file, like today.
+2. Open loose-object-idx.lock with O_CREAT | O_EXCL to acquire the lock.
+3. Rename the loose object into place.
+4. Open loose-object-idx with O_APPEND and write the new object
+5. Unlink loose-object-idx.lock to release the lock.
+
+To remove entries (e.g. in "git pack-refs" or "git-prune"):
+
+1. Open loose-object-idx.lock with O_CREAT | O_EXCL to acquire the
+   lock.
+2. Write the new content to loose-object-idx.lock.
+3. Unlink any loose objects being removed.
+4. Rename to replace loose-object-idx, releasing the lock.
+
+Translation table
+~~~~~~~~~~~~~~~~~
+The index files support a bidirectional mapping between sha1-names
+and newhash-names. The lookup proceeds similarly to ordinary object
+lookups. For example, to convert a sha1-name to a newhash-name:
+
+ 1. Look for the object in idx files. If a match is present in the
+    idx's sorted list of truncated sha1-names, then:
+    a. Read the corresponding entry in the sha1-name order to pack
+       name order mapping.
+    b. Read the corresponding entry in the full sha1-name table to
+       verify we found the right object. If it is, then
+    c. Read the corresponding entry in the full newhash-name table.
+       That is the object's newhash-name.
+ 2. Check for a loose object. Read lines from loose-object-idx until
+    we find a match.
+
+Step (1) takes the same amount of time as an ordinary object lookup:
+O(number of packs * log(objects per pack)). Step (2) takes O(number of
+loose objects) time. To maintain good performance it will be necessary
+to keep the number of loose objects low. See the "Loose objects and
+unreachable objects" section below for more details.
+
+Since all operations that make new objects (e.g., "git commit") add
+the new objects to the corresponding index, this mapping is possible
+for all objects in the object store.
+
+Reading an object's sha1-content
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The sha1-content of an object can be read by converting all newhash-names
+its newhash-content references to sha1-names using the translation table.
+
+Fetch
+~~~~~
+Fetching from a SHA-1 based server requires translating between SHA-1
+and NewHash based representations on the fly.
+
+SHA-1s named in the ref advertisement that are present on the client
+can be translated to NewHash and looked up as local objects using the
+translation table.
+
+Negotiation proceeds as today. Any "have"s generated locally are
+converted to SHA-1 before being sent to the server, and SHA-1s
+mentioned by the server are converted to NewHash when looking them up
+locally.
+
+After negotiation, the server sends a packfile containing the
+requested objects. We convert the packfile to NewHash format using
+the following steps:
+
+1. index-pack: inflate each object in the packfile and compute its
+   SHA-1. Objects can contain deltas in OBJ_REF_DELTA format against
+   objects the client has locally. These objects can be looked up
+   using the translation table and their sha1-content read as
+   described above to resolve the deltas.
+2. topological sort: starting at the "want"s from the negotiation
+   phase, walk through objects in the pack and emit a list of them,
+   excluding blobs, in reverse topologically sorted order, with each
+   object coming later in the list than all objects it references.
+   (This list only contains objects reachable from the "wants". If the
+   pack from the server contained additional extraneous objects, then
+   they will be discarded.)
+3. convert to newhash: open a new (newhash) packfile. Read the topologically
+   sorted list just generated. For each object, inflate its
+   sha1-content, convert to newhash-content, and write it to the newhash
+   pack. Record the new sha1<->newhash mapping entry for use in the idx.
+4. sort: reorder entries in the new pack to match the order of objects
+   in the pack the server generated and include blobs. Write a newhash idx
+   file
+5. clean up: remove the SHA-1 based pack file, index, and
+   topologically sorted list obtained from the server in steps 1
+   and 2.
+
+Step 3 requires every object referenced by the new object to be in the
+translation table. This is why the topological sort step is necessary.
+
+As an optimization, step 1 could write a file describing what non-blob
+objects each object it has inflated from the packfile references. This
+makes the topological sort in step 2 possible without inflating the
+objects in the packfile for a second time. The objects need to be
+inflated again in step 3, for a total of two inflations.
+
+Step 4 is probably necessary for good read-time performance. "git
+pack-objects" on the server optimizes the pack file for good data
+locality (see Documentation/technical/pack-heuristics.txt).
+
+Details of this process are likely to change. It will take some
+experimenting to get this to perform well.
+
+Push
+~~~~
+Push is simpler than fetch because the objects referenced by the
+pushed objects are already in the translation table. The sha1-content
+of each object being pushed can be read as described in the "Reading
+an object's sha1-content" section to generate the pack written by git
+send-pack.
+
+Signed Commits
+~~~~~~~~~~~~~~
+We add a new field "gpgsig-newhash" to the commit object format to allow
+signing commits without relying on SHA-1. It is similar to the
+existing "gpgsig" field. Its signed payload is the newhash-content of the
+commit object with any "gpgsig" and "gpgsig-newhash" fields removed.
+
+This means commits can be signed
+1. using SHA-1 only, as in existing signed commit objects
+2. using both SHA-1 and NewHash, by using both gpgsig-newhash and gpgsig
+   fields.
+3. using only NewHash, by only using the gpgsig-newhash field.
+
+Old versions of "git verify-commit" can verify the gpgsig signature in
+cases (1) and (2) without modifications and view case (3) as an
+ordinary unsigned commit.
+
+Signed Tags
+~~~~~~~~~~~
+We add a new field "gpgsig-newhash" to the tag object format to allow
+signing tags without relying on SHA-1. Its signed payload is the
+newhash-content of the tag with its gpgsig-newhash field and "-----BEGIN PGP
+SIGNATURE-----" delimited in-body signature removed.
+
+This means tags can be signed
+1. using SHA-1 only, as in existing signed tag objects
+2. using both SHA-1 and NewHash, by using gpgsig-newhash and an in-body
+   signature.
+3. using only NewHash, by only using the gpgsig-newhash field.
+
+Mergetag embedding
+~~~~~~~~~~~~~~~~~~
+The mergetag field in the sha1-content of a commit contains the
+sha1-content of a tag that was merged by that commit.
+
+The mergetag field in the newhash-content of the same commit contains the
+newhash-content of the same tag.
+
+Submodules
+~~~~~~~~~~
+To convert recorded submodule pointers, you need to have the converted
+submodule repository in place. The translation table of the submodule
+can be used to look up the new hash.
+
+Loose objects and unreachable objects
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Fast lookups in the loose-object-idx require that the number of loose
+objects not grow too high.
+
+"git gc --auto" currently waits for there to be 6700 loose objects
+present before consolidating them into a packfile. We will need to
+measure to find a more appropriate threshold for it to use.
+
+"git gc --auto" currently waits for there to be 50 packs present
+before combining packfiles. Packing loose objects more aggressively
+may cause the number of pack files to grow too quickly. This can be
+mitigated by using a strategy similar to Martin Fick's exponential
+rolling garbage collection script:
+https://gerrit-review.googlesource.com/c/gerrit/+/35215
+
+"git gc" currently expels any unreachable objects it encounters in
+pack files to loose objects in an attempt to prevent a race when
+pruning them (in case another process is simultaneously writing a new
+object that refers to the about-to-be-deleted object). This leads to
+an explosion in the number of loose objects present and disk space
+usage due to the objects in delta form being replaced with independent
+loose objects.  Worse, the race is still present for loose objects.
+
+Instead, "git gc" will need to move unreachable objects to a new
+packfile marked as UNREACHABLE_GARBAGE (using the PSRC field; see
+below). To avoid the race when writing new objects referring to an
+about-to-be-deleted object, code paths that write new objects will
+need to copy any objects from UNREACHABLE_GARBAGE packs that they
+refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
+UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
+indicated by the file's mtime) is long enough ago.
+
+To avoid a proliferation of UNREACHABLE_GARBAGE packs, they can be
+combined under certain circumstances. If "gc.garbageTtl" is set to
+greater than one day, then packs created within a single calendar day,
+UTC, can be coalesced together. The resulting packfile would have an
+mtime before midnight on that day, so this makes the effective maximum
+ttl the garbageTtl + 1 day. If "gc.garbageTtl" is less than one day,
+then we divide the calendar day into intervals one-third of that ttl
+in duration. Packs created within the same interval can be coalesced
+together. The resulting packfile would have an mtime before the end of
+the interval, so this makes the effective maximum ttl equal to the
+garbageTtl * 4/3.
+
+This rule comes from Thirumala Reddy Mutchukota's JGit change
+https://git.eclipse.org/r/90465.
+
+The UNREACHABLE_GARBAGE setting goes in the PSRC field of the pack
+index. More generally, that field indicates where a pack came from:
+
+ - 1 (PACK_SOURCE_RECEIVE) for a pack received over the network
+ - 2 (PACK_SOURCE_AUTO) for a pack created by a lightweight
+   "gc --auto" operation
+ - 3 (PACK_SOURCE_GC) for a pack created by a full gc
+ - 4 (PACK_SOURCE_UNREACHABLE_GARBAGE) for potential garbage
+   discovered by gc
+ - 5 (PACK_SOURCE_INSERT) for locally created objects that were
+   written directly to a pack file, e.g. from "git add ."
+
+This information can be useful for debugging and for "gc --auto" to
+make appropriate choices about which packs to coalesce.
+
+Caveats
+-------
+Invalid objects
+~~~~~~~~~~~~~~~
+The conversion from sha1-content to newhash-content retains any
+brokenness in the original object (e.g., tree entry modes encoded with
+leading 0, tree objects whose paths are not sorted correctly, and
+commit objects without an author or committer). This is a deliberate
+feature of the design to allow the conversion to round-trip.
+
+More profoundly broken objects (e.g., a commit with a truncated "tree"
+header line) cannot be converted but were not usable by current Git
+anyway.
+
+Shallow clone and submodules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Because it requires all referenced objects to be available in the
+locally generated translation table, this design does not support
+shallow clone or unfetched submodules. Protocol improvements might
+allow lifting this restriction.
+
+Alternates
+~~~~~~~~~~
+For the same reason, a newhash repository cannot borrow objects from a
+sha1 repository using objects/info/alternates or
+$GIT_ALTERNATE_OBJECT_REPOSITORIES.
+
+git notes
+~~~~~~~~~
+The "git notes" tool annotates objects using their sha1-name as key.
+This design does not describe a way to migrate notes trees to use
+newhash-names. That migration is expected to happen separately (for
+example using a file at the root of the notes tree to describe which
+hash it uses).
+
+Server-side cost
+~~~~~~~~~~~~~~~~
+Until Git protocol gains NewHash support, using NewHash based storage
+on public-facing Git servers is strongly discouraged. Once Git
+protocol gains NewHash support, NewHash based servers are likely not
+to support SHA-1 compatibility, to avoid what may be a very expensive
+hash reencode during clone and to encourage peers to modernize.
+
+The design described here allows fetches by SHA-1 clients of a
+personal NewHash repository because it's not much more difficult than
+allowing pushes from that repository. This support needs to be guarded
+by a configuration option --- servers like git.kernel.org that serve a
+large number of clients would not be expected to bear that cost.
+
+Meaning of signatures
+~~~~~~~~~~~~~~~~~~~~~
+The signed payload for signed commits and tags does not explicitly
+name the hash used to identify objects. If some day Git adopts a new
+hash function with the same length as the current SHA-1 (40
+hexadecimal digit) or NewHash (64 hexadecimal digit) objects then the
+intent behind the PGP signed payload in an object signature is
+unclear:
+
+	object e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7
+	type commit
+	tag v2.12.0
+	tagger Junio C Hamano <gitster@pobox.com> 1487962205 -0800
+
+	Git 2.12
+
+Does this mean Git v2.12.0 is the commit with sha1-name
+e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 or the commit with
+new-40-digit-hash-name e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7?
+
+Fortunately NewHash and SHA-1 have different lengths. If Git starts
+using another hash with the same length to name objects, then it will
+need to change the format of signed payloads using that hash to
+address this issue.
+
+Object names on the command line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To support the transition (see Transition plan below), this design
+supports four different modes of operation:
+
+ 1. ("dark launch") Treat object names input by the user as SHA-1 and
+    convert any object names written to output to SHA-1, but store
+    objects using NewHash.  This allows users to test the code with no
+    visible behavior change except for performance.  This allows
+    allows running even tests that assume the SHA-1 hash function, to
+    sanity-check the behavior of the new mode.
+
+ 2. ("early transition") Allow both SHA-1 and NewHash object names in
+    input. Any object names written to output use SHA-1. This allows
+    users to continue to make use of SHA-1 to communicate with peers
+    (e.g. by email) that have not migrated yet and prepares for mode 3.
+
+ 3. ("late transition") Allow both SHA-1 and NewHash object names in
+    input. Any object names written to output use NewHash. In this
+    mode, users are using a more secure object naming method by
+    default.  The disruption is minimal as long as most of their peers
+    are in mode 2 or mode 3.
+
+ 4. ("post-transition") Treat object names input by the user as
+    NewHash and write output using NewHash. This is safer than mode 3
+    because there is less risk that input is incorrectly interpreted
+    using the wrong hash function.
+
+The mode is specified in configuration.
+
+The user can also explicitly specify which format to use for a
+particular revision specifier and for output, overriding the mode. For
+example:
+
+git --output-format=sha1 log abac87a^{sha1}..f787cac^{newhash}
+
+Selection of a New Hash
+-----------------------
+In early 2005, around the time that Git was written,  Xiaoyun Wang,
+Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
+collisions in 2^69 operations. In August they published details.
+Luckily, no practical demonstrations of a collision in full SHA-1 were
+published until 10 years later, in 2017.
+
+The hash function NewHash to replace SHA-1 should be stronger than
+SHA-1 was: we would like it to be trustworthy and useful in practice
+for at least 10 years.
+
+Some other relevant properties:
+
+1. A 256-bit hash (long enough to match common security practice; not
+   excessively long to hurt performance and disk usage).
+
+2. High quality implementations should be widely available (e.g. in
+   OpenSSL).
+
+3. The hash function's properties should match Git's needs (e.g. Git
+   requires collision and 2nd preimage resistance and does not require
+   length extension resistance).
+
+4. As a tiebreaker, the hash should be fast to compute (fortunately
+   many contenders are faster than SHA-1).
+
+Some hashes under consideration are SHA-256, SHA-512/256, SHA-256x16,
+K12, and BLAKE2bp-256.
+
+Transition plan
+---------------
+Some initial steps can be implemented independently of one another:
+- adding a hash function API (vtable)
+- teaching fsck to tolerate the gpgsig-newhash field
+- excluding gpgsig-* from the fields copied by "git commit --amend"
+- annotating tests that depend on SHA-1 values with a SHA1 test
+  prerequisite
+- using "struct object_id", GIT_MAX_RAWSZ, and GIT_MAX_HEXSZ
+  consistently instead of "unsigned char *" and the hardcoded
+  constants 20 and 40.
+- introducing index v3
+- adding support for the PSRC field and safer object pruning
+
+
+The first user-visible change is the introduction of the objectFormat
+extension (without compatObjectFormat). This requires:
+- implementing the loose-object-idx
+- teaching fsck about this mode of operation
+- using the hash function API (vtable) when computing object names
+- signing objects and verifying signatures
+- rejecting attempts to fetch from or push to an incompatible
+  repository
+
+Next comes introduction of compatObjectFormat:
+- translating object names between object formats
+- translating object content between object formats
+- generating and verifying signatures in the compat format
+- adding appropriate index entries when adding a new object to the
+  object store
+- --output-format option
+- ^{sha1} and ^{newhash} revision notation
+- configuration to specify default input and output format (see
+  "Object names on the command line" above)
+
+The next step is supporting fetches and pushes to SHA-1 repositories:
+- allow pushes to a repository using the compat format
+- generate a topologically sorted list of the SHA-1 names of fetched
+  objects
+- convert the fetched packfile to newhash format and generate an idx
+  file
+- re-sort to match the order of objects in the fetched packfile
+
+The infrastructure supporting fetch also allows converting an existing
+repository. In converted repositories and new clones, end users can
+gain support for the new hash function without any visible change in
+behavior (see "dark launch" in the "Object names on the command line"
+section). In particular this allows users to verify NewHash signatures
+on objects in the repository, and it should ensure the transition code
+is stable in production in preparation for using it more widely.
+
+Over time projects would encourage their users to adopt the "early
+transition" and then "late transition" modes to take advantage of the
+new, more futureproof NewHash object names.
+
+When objectFormat and compatObjectFormat are both set, commands
+generating signatures would generate both SHA-1 and NewHash signatures
+by default to support both new and old users.
+
+In projects using NewHash heavily, users could be encouraged to adopt
+the "post-transition" mode to avoid accidentally making implicit use
+of SHA-1 object names.
+
+Once a critical mass of users have upgraded to a version of Git that
+can verify NewHash signatures and have converted their existing
+repositories to support verifying them, we can add support for a
+setting to generate only NewHash signatures. This is expected to be at
+least a year later.
+
+That is also a good moment to advertise the ability to convert
+repositories to use NewHash only, stripping out all SHA-1 related
+metadata. This improves performance by eliminating translation
+overhead and security by avoiding the possibility of accidentally
+relying on the safety of SHA-1.
+
+Updating Git's protocols to allow a server to specify which hash
+functions it supports is also an important part of this transition. It
+is not discussed in detail in this document but this transition plan
+assumes it happens. :)
+
+Alternatives considered
+-----------------------
+Upgrading everyone working on a particular project on a flag day
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Projects like the Linux kernel are large and complex enough that
+flipping the switch for all projects based on the repository at once
+is infeasible.
+
+Not only would all developers and server operators supporting
+developers have to switch on the same flag day, but supporting tooling
+(continuous integration, code review, bug trackers, etc) would have to
+be adapted as well. This also makes it difficult to get early feedback
+from some project participants testing before it is time for mass
+adoption.
+
+Using hash functions in parallel
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
+Objects newly created would be addressed by the new hash, but inside
+such an object (e.g. commit) it is still possible to address objects
+using the old hash function.
+* You cannot trust its history (needed for bisectability) in the
+  future without further work
+* Maintenance burden as the number of supported hash functions grows
+  (they will never go away, so they accumulate). In this proposal, by
+  comparison, converted objects lose all references to SHA-1.
+
+Signed objects with multiple hashes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Instead of introducing the gpgsig-newhash field in commit and tag objects
+for newhash-content based signatures, an earlier version of this design
+added "hash newhash <newhash-name>" fields to strengthen the existing
+sha1-content based signatures.
+
+In other words, a single signature was used to attest to the object
+content using both hash functions. This had some advantages:
+* Using one signature instead of two speeds up the signing process.
+* Having one signed payload with both hashes allows the signer to
+  attest to the sha1-name and newhash-name referring to the same object.
+* All users consume the same signature. Broken signatures are likely
+  to be detected quickly using current versions of git.
+
+However, it also came with disadvantages:
+* Verifying a signed object requires access to the sha1-names of all
+  objects it references, even after the transition is complete and
+  translation table is no longer needed for anything else. To support
+  this, the design added fields such as "hash sha1 tree <sha1-name>"
+  and "hash sha1 parent <sha1-name>" to the newhash-content of a signed
+  commit, complicating the conversion process.
+* Allowing signed objects without a sha1 (for after the transition is
+  complete) complicated the design further, requiring a "nohash sha1"
+  field to suppress including "hash sha1" fields in the newhash-content
+  and signed payload.
+
+Lazily populated translation table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Some of the work of building the translation table could be deferred to
+push time, but that would significantly complicate and slow down pushes.
+Calculating the sha1-name at object creation time at the same time it is
+being streamed to disk and having its newhash-name calculated should be
+an acceptable cost.
+
+Document History
+----------------
+
+2017-03-03
+bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com,
+sbeller@google.com
+
+Initial version sent to
+http://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
+
+2017-03-03 jrnieder@gmail.com
+Incorporated suggestions from jonathantanmy and sbeller:
+* describe purpose of signed objects with each hash type
+* redefine signed object verification using object content under the
+  first hash function
+
+2017-03-06 jrnieder@gmail.com
+* Use SHA3-256 instead of SHA2 (thanks, Linus and brian m. carlson).[1][2]
+* Make sha3-based signatures a separate field, avoiding the need for
+  "hash" and "nohash" fields (thanks to peff[3]).
+* Add a sorting phase to fetch (thanks to Junio for noticing the need
+  for this).
+* Omit blobs from the topological sort during fetch (thanks to peff).
+* Discuss alternates, git notes, and git servers in the caveats
+  section (thanks to Junio Hamano, brian m. carlson[4], and Shawn
+  Pearce).
+* Clarify language throughout (thanks to various commenters,
+  especially Junio).
+
+2017-09-27 jrnieder@gmail.com, sbeller@google.com
+* use placeholder NewHash instead of SHA3-256
+* describe criteria for picking a hash function.
+* include a transition plan (thanks especially to Brandon Williams
+  for fleshing these ideas out)
+* define the translation table (thanks, Shawn Pearce[5], Jonathan
+  Tan, and Masaya Suzuki)
+* avoid loose object overhead by packing more aggressively in
+  "git gc --auto"
+
+[1] http://public-inbox.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
+[2] http://public-inbox.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
+[3] http://public-inbox.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
+[4] http://public-inbox.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
+[5] https://public-inbox.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index a34917153..ed1eae8b8 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -199,7 +199,7 @@ After reference and capabilities discovery, the client can decide to
 terminate the connection by sending a flush-pkt, telling the server it can
 now gracefully terminate, and disconnect, when it does not need any pack
 data. This can happen with the ls-remote command, and also can happen when
-the client already is up-to-date.
+the client already is up to date.
 
 Otherwise, it enters the negotiation phase, where the client and
 server determine what the minimal packfile necessary for transport is,
diff --git a/Documentation/technical/trivial-merge.txt b/Documentation/technical/trivial-merge.txt
index c79d4a7c4..1f1c33d0d 100644
--- a/Documentation/technical/trivial-merge.txt
+++ b/Documentation/technical/trivial-merge.txt
@@ -32,7 +32,7 @@ or the result.
 If multiple cases apply, the one used is listed first.
 
 A result which changes the index is an error if the index is not empty
-and not up-to-date.
+and not up to date.
 
 Entries marked '+' have stat information. Spaces marked '*' don't
 affect the result.
@@ -65,7 +65,7 @@ empty, no entry is left for that stage). Otherwise, the given entry is
 left in stage 0, and there are no other entries.
 
 A result of "no merge" is an error if the index is not empty and not
-up-to-date.
+up to date.
 
 *empty* means that the tree must not have a directory-file conflict
  with the entry.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index bc2929867..b4d88af13 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2044,10 +2044,12 @@ If a push would not result in a <<fast-forwards,fast-forward>> of the
 remote branch, then it will fail with an error like:
 
 -------------------------------------------------
-error: remote 'refs/heads/master' is not an ancestor of
- local  'refs/heads/master'.
- Maybe you are not up-to-date and need to pull first?
-error: failed to push to 'ssh://yourserver.com/~you/proj.git'
+ ! [rejected]        master -> master (non-fast-forward)
+error: failed to push some refs to '...'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. Integrate the remote changes (e.g.
+hint: 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 -------------------------------------------------
 
 This can happen, for example, if you:
@@ -2193,7 +2195,7 @@ $ cd work
 Linus's tree will be stored in the remote-tracking branch named origin/master,
 and can be updated using linkgit:git-fetch[1]; you can track other
 public trees using linkgit:git-remote[1] to set up a "remote" and
-linkgit:git-fetch[1] to keep them up-to-date; see
+linkgit:git-fetch[1] to keep them up to date; see
 <<repositories-and-branches>>.
 
 Now create the branches in which you are going to work; these start out
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1ab52e381..9ef24f24d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.14.2
+DEF_VER=v2.15.0-rc2
 
 LF='
 '
diff --git a/Makefile b/Makefile
index 043ec8377..cd7598599 100644
--- a/Makefile
+++ b/Makefile
@@ -162,6 +162,11 @@ all::
 # algorithm. This is slower, but may detect attempted collision attacks.
 # Takes priority over other *_SHA1 knobs.
 #
+# Define DC_SHA1_EXTERNAL in addition to DC_SHA1 if you want to build / link
+# git with the external SHA1 collision-detect library.
+# Without this option, i.e. the default behavior is to build git with its
+# own built-in code (or submodule).
+#
 # Define DC_SHA1_SUBMODULE in addition to DC_SHA1 to use the
 # sha1collisiondetection shipped as a submodule instead of the
 # non-submodule copy in sha1dc/. This is an experimental option used
@@ -200,6 +205,9 @@ all::
 #
 # Define NO_MMAP if you want to avoid mmap.
 #
+# Define MMAP_PREVENTS_DELETE if a file that is currently mmapped cannot be
+# deleted or cannot be replaced using rename().
+#
 # Define NO_SYS_POLL_H if you don't have sys/poll.h.
 #
 # Define NO_POLL if you do not have or don't want to use poll().
@@ -655,6 +663,7 @@ TEST_PROGRAMS_NEED_X += test-parse-options
 TEST_PROGRAMS_NEED_X += test-path-utils
 TEST_PROGRAMS_NEED_X += test-prio-queue
 TEST_PROGRAMS_NEED_X += test-read-cache
+TEST_PROGRAMS_NEED_X += test-write-cache
 TEST_PROGRAMS_NEED_X += test-ref-store
 TEST_PROGRAMS_NEED_X += test-regex
 TEST_PROGRAMS_NEED_X += test-revision-walking
@@ -815,7 +824,9 @@ LIB_OBJS += notes-cache.o
 LIB_OBJS += notes-merge.o
 LIB_OBJS += notes-utils.o
 LIB_OBJS += object.o
+LIB_OBJS += oidmap.o
 LIB_OBJS += oidset.o
+LIB_OBJS += packfile.o
 LIB_OBJS += pack-bitmap.o
 LIB_OBJS += pack-bitmap-write.o
 LIB_OBJS += pack-check.o
@@ -842,6 +853,7 @@ LIB_OBJS += reflog-walk.o
 LIB_OBJS += refs.o
 LIB_OBJS += refs/files-backend.o
 LIB_OBJS += refs/iterator.o
+LIB_OBJS += refs/packed-backend.o
 LIB_OBJS += refs/ref-cache.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
@@ -1033,6 +1045,9 @@ BASIC_CFLAGS += -fno-omit-frame-pointer
 ifneq ($(filter undefined,$(SANITIZERS)),)
 BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
 endif
+ifneq ($(filter leak,$(SANITIZERS)),)
+BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
+endif
 endif
 
 ifndef sysconfdir
@@ -1380,6 +1395,9 @@ else
 		COMPAT_OBJS += compat/win32mmap.o
 	endif
 endif
+ifdef MMAP_PREVENTS_DELETE
+	BASIC_CFLAGS += -DMMAP_PREVENTS_DELETE
+endif
 ifdef OBJECT_CREATION_USES_RENAMES
 	COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
 endif
@@ -1472,6 +1490,15 @@ ifdef APPLE_COMMON_CRYPTO
 	BASIC_CFLAGS += -DSHA1_APPLE
 else
 	DC_SHA1 := YesPlease
+	BASIC_CFLAGS += -DSHA1_DC
+	LIB_OBJS += sha1dc_git.o
+ifdef DC_SHA1_EXTERNAL
+	ifdef DC_SHA1_SUBMODULE
+$(error Only set DC_SHA1_EXTERNAL or DC_SHA1_SUBMODULE, not both)
+	endif
+	BASIC_CFLAGS += -DDC_SHA1_EXTERNAL
+	EXTLIBS += -lsha1detectcoll
+else
 ifdef DC_SHA1_SUBMODULE
 	LIB_OBJS += sha1collisiondetection/lib/sha1.o
 	LIB_OBJS += sha1collisiondetection/lib/ubc_check.o
@@ -1481,17 +1508,15 @@ else
 	LIB_OBJS += sha1dc/ubc_check.o
 endif
 	BASIC_CFLAGS += \
-		-DSHA1_DC \
 		-DSHA1DC_NO_STANDARD_INCLUDES \
 		-DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 \
 		-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" \
-		-DSHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_C="\"sha1dc_git.c\"" \
-		-DSHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_H="\"sha1dc_git.h\"" \
 		-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""
 endif
 endif
 endif
 endif
+endif
 
 ifdef SHA1_MAX_BLOCK_SIZE
 	LIB_OBJS += compat/sha1-chunked.o
@@ -2439,6 +2464,10 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
 .PHONY: sparse $(SP_OBJ)
 sparse: $(SP_OBJ)
 
+.PHONY: style
+style:
+	git clang-format --style file --diff --extensions c,h
+
 check: common-cmds.h
 	@if sparse; \
 	then \
diff --git a/RelNotes b/RelNotes
index 8612bbde7..80ae7a311 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.14.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.15.0.txt
\ No newline at end of file
diff --git a/abspath.c b/abspath.c
index 708aff8d4..985798532 100644
--- a/abspath.c
+++ b/abspath.c
@@ -202,6 +202,10 @@ error_out:
 	return retval;
 }
 
+/*
+ * Resolve `path` into an absolute, cleaned-up path. The return value
+ * comes from a shared buffer.
+ */
 const char *real_path(const char *path)
 {
 	static struct strbuf realpath = STRBUF_INIT;
diff --git a/apply.c b/apply.c
index 0c7b25989..c022af53a 100644
--- a/apply.c
+++ b/apply.c
@@ -812,16 +812,13 @@ static int has_epoch_timestamp(const char *nameline)
 	 * 1970-01-01, and the seconds part must be "00".
 	 */
 	const char stamp_regexp[] =
-		"^(1969-12-31|1970-01-01)"
-		" "
-		"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
+		"^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
 		" "
 		"([-+][0-2][0-9]:?[0-5][0-9])\n";
 	const char *timestamp = NULL, *cp, *colon;
 	static regex_t *stamp;
 	regmatch_t m[10];
-	int zoneoffset;
-	int hourminute;
+	int zoneoffset, epoch_hour, hour, minute;
 	int status;
 
 	for (cp = nameline; *cp != '\n'; cp++) {
@@ -830,6 +827,18 @@ static int has_epoch_timestamp(const char *nameline)
 	}
 	if (!timestamp)
 		return 0;
+
+	/*
+	 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
+	 * (west of GMT) or 1970-01-01 (east of GMT)
+	 */
+	if (skip_prefix(timestamp, "1969-12-31 ", &timestamp))
+		epoch_hour = 24;
+	else if (skip_prefix(timestamp, "1970-01-01 ", &timestamp))
+		epoch_hour = 0;
+	else
+		return 0;
+
 	if (!stamp) {
 		stamp = xmalloc(sizeof(*stamp));
 		if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
@@ -847,6 +856,9 @@ static int has_epoch_timestamp(const char *nameline)
 		return 0;
 	}
 
+	hour = strtol(timestamp, NULL, 10);
+	minute = strtol(timestamp + m[1].rm_so, NULL, 10);
+
 	zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
 	if (*colon == ':')
 		zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
@@ -855,20 +867,7 @@ static int has_epoch_timestamp(const char *nameline)
 	if (timestamp[m[3].rm_so] == '-')
 		zoneoffset = -zoneoffset;
 
-	/*
-	 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
-	 * (west of GMT) or 1970-01-01 (east of GMT)
-	 */
-	if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) ||
-	    (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10)))
-		return 0;
-
-	hourminute = (strtol(timestamp + 11, NULL, 10) * 60 +
-		      strtol(timestamp + 14, NULL, 10) -
-		      zoneoffset);
-
-	return ((zoneoffset < 0 && hourminute == 1440) ||
-		(0 <= zoneoffset && !hourminute));
+	return hour * 60 + minute - zoneoffset == epoch_hour * 60;
 }
 
 /*
@@ -2921,6 +2920,7 @@ static int apply_one_fragment(struct apply_state *state,
 			if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
 			    ws_blank_line(patch + 1, plen, ws_rule))
 				is_blank_context = 1;
+			/* fallthrough */
 		case '-':
 			memcpy(old, patch + 1, plen);
 			add_line_info(&preimage, old, plen,
@@ -2928,7 +2928,7 @@ static int apply_one_fragment(struct apply_state *state,
 			old += plen;
 			if (first == '-')
 				break;
-		/* Fall-through for ' ' */
+			/* fallthrough */
 		case '+':
 			/* --no-add does not add new lines */
 			if (first == '+' && state->no_add)
@@ -3577,7 +3577,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);
-	else if (get_sha1(patch->old_sha1_prefix, pre_oid.hash) ||
+	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."));
 
@@ -4101,7 +4101,7 @@ static int build_fake_ancestor(struct apply_state *state, struct patch *list)
 			else
 				return error(_("sha1 information is lacking or "
 					       "useless for submodule %s"), name);
-		} else if (!get_sha1_blob(patch->old_sha1_prefix, oid.hash)) {
+		} else if (!get_oid_blob(patch->old_sha1_prefix, &oid)) {
 			; /* ok */
 		} else if (!patch->lines_added && !patch->lines_deleted) {
 			/* mode-only change: update the current */
diff --git a/archive.c b/archive.c
index f81bd3649..1e41f4bbe 100644
--- a/archive.c
+++ b/archive.c
@@ -376,7 +376,7 @@ static void parse_treeish_arg(const char **argv,
 		free(ref);
 	}
 
-	if (get_sha1(name, oid.hash))
+	if (get_oid(name, &oid))
 		die("Not a valid object name");
 
 	commit = lookup_commit_reference_gently(&oid, 1);
diff --git a/attr.c b/attr.c
index 56961f023..dfc3a558d 100644
--- a/attr.c
+++ b/attr.c
@@ -76,18 +76,20 @@ struct attr_hash_entry {
 };
 
 /* attr_hashmap comparison function */
-static int attr_hash_entry_cmp(void *unused_cmp_data,
-			       const struct attr_hash_entry *a,
-			       const struct attr_hash_entry *b,
-			       void *unused_keydata)
+static int attr_hash_entry_cmp(const void *unused_cmp_data,
+			       const void *entry,
+			       const void *entry_or_key,
+			       const void *unused_keydata)
 {
+	const struct attr_hash_entry *a = entry;
+	const struct attr_hash_entry *b = entry_or_key;
 	return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen);
 }
 
 /* Initialize an 'attr_hashmap' object */
 static void attr_hashmap_init(struct attr_hashmap *map)
 {
-	hashmap_init(&map->map, (hashmap_cmp_fn) attr_hash_entry_cmp, NULL, 0);
+	hashmap_init(&map->map, attr_hash_entry_cmp, NULL, 0);
 }
 
 /*
@@ -149,10 +151,12 @@ struct all_attrs_item {
 static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
 {
 	int i;
+	unsigned int size;
 
 	hashmap_lock(map);
 
-	if (map->map.size < check->all_attrs_nr)
+	size = hashmap_get_size(&map->map);
+	if (size < check->all_attrs_nr)
 		die("BUG: interned attributes shouldn't be deleted");
 
 	/*
@@ -161,13 +165,13 @@ static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
 	 * field), reallocate the provided attr_check instance's all_attrs
 	 * field and fill each entry with its corresponding git_attr.
 	 */
-	if (map->map.size != check->all_attrs_nr) {
+	if (size != check->all_attrs_nr) {
 		struct attr_hash_entry *e;
 		struct hashmap_iter iter;
 		hashmap_iter_init(&map->map, &iter);
 
-		REALLOC_ARRAY(check->all_attrs, map->map.size);
-		check->all_attrs_nr = map->map.size;
+		REALLOC_ARRAY(check->all_attrs, size);
+		check->all_attrs_nr = size;
 
 		while ((e = hashmap_iter_next(&iter))) {
 			const struct git_attr *a = e->value;
@@ -235,10 +239,11 @@ static const struct git_attr *git_attr_internal(const char *name, int namelen)
 
 	if (!a) {
 		FLEX_ALLOC_MEM(a, name, name, namelen);
-		a->attr_nr = g_attr_hashmap.map.size;
+		a->attr_nr = hashmap_get_size(&g_attr_hashmap.map);
 
 		attr_hashmap_add(&g_attr_hashmap, a->name, namelen, a);
-		assert(a->attr_nr == (g_attr_hashmap.map.size - 1));
+		assert(a->attr_nr ==
+		       (hashmap_get_size(&g_attr_hashmap.map) - 1));
 	}
 
 	hashmap_unlock(&g_attr_hashmap);
diff --git a/bisect.c b/bisect.c
index a9fd9fbc6..96beeb5d1 100644
--- a/bisect.c
+++ b/bisect.c
@@ -680,16 +680,16 @@ static int is_expected_rev(const struct object_id *oid)
 	return res;
 }
 
-static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout)
+static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 {
 	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
 
-	memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
-	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
+	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 
 	argv_checkout[2] = bisect_rev_hex;
 	if (no_checkout) {
-		update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+		update_ref(NULL, "BISECT_HEAD", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 	} else {
 		int res;
 		res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
@@ -796,7 +796,7 @@ static void check_merge_bases(int no_checkout)
 			handle_skipped_merge_base(mb);
 		} else {
 			printf(_("Bisecting: a merge base must be tested\n"));
-			exit(bisect_checkout(mb->hash, no_checkout));
+			exit(bisect_checkout(mb, no_checkout));
 		}
 	}
 
@@ -826,7 +826,8 @@ static int check_ancestors(const char *prefix)
 
 	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_for_object_array(&pending_copy, ALL_REV_FLAGS);
-	free(pending_copy.objects);
+
+	object_array_clear(&pending_copy);
 
 	return res;
 }
@@ -939,7 +940,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
 	struct rev_info revs;
 	struct commit_list *tried;
 	int reaches = 0, all = 0, nr, steps;
-	const unsigned char *bisect_rev;
+	struct object_id *bisect_rev;
 	char *steps_msg;
 
 	read_bisect_terms(&term_bad, &term_good);
@@ -977,11 +978,11 @@ int bisect_next_all(const char *prefix, int no_checkout)
 		exit(4);
 	}
 
-	bisect_rev = revs.commits->item->object.oid.hash;
+	bisect_rev = &revs.commits->item->object.oid;
 
-	if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
+	if (!oidcmp(bisect_rev, current_bad_oid)) {
 		exit_if_skipped_commits(tried, current_bad_oid);
-		printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev),
+		printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
 			term_bad);
 		show_diff_tree(prefix, revs.commits->item);
 		/* This means the bisection process succeeded. */
diff --git a/branch.c b/branch.c
index 36541d05c..4377ce2fb 100644
--- a/branch.c
+++ b/branch.c
@@ -90,24 +90,24 @@ int install_branch_config(int flag, const char *local, const char *origin, const
 		if (shortname) {
 			if (origin)
 				printf_ln(rebasing ?
-					  _("Branch %s set up to track remote branch %s from %s by rebasing.") :
-					  _("Branch %s set up to track remote branch %s from %s."),
+					  _("Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.") :
+					  _("Branch '%s' set up to track remote branch '%s' from '%s'."),
 					  local, shortname, origin);
 			else
 				printf_ln(rebasing ?
-					  _("Branch %s set up to track local branch %s by rebasing.") :
-					  _("Branch %s set up to track local branch %s."),
+					  _("Branch '%s' set up to track local branch '%s' by rebasing.") :
+					  _("Branch '%s' set up to track local branch '%s'."),
 					  local, shortname);
 		} else {
 			if (origin)
 				printf_ln(rebasing ?
-					  _("Branch %s set up to track remote ref %s by rebasing.") :
-					  _("Branch %s set up to track remote ref %s."),
+					  _("Branch '%s' set up to track remote ref '%s' by rebasing.") :
+					  _("Branch '%s' set up to track remote ref '%s'."),
 					  local, remote);
 			else
 				printf_ln(rebasing ?
-					  _("Branch %s set up to track local ref %s by rebasing.") :
-					  _("Branch %s set up to track local ref %s."),
+					  _("Branch '%s' set up to track local ref '%s' by rebasing.") :
+					  _("Branch '%s' set up to track local ref '%s'."),
 					  local, remote);
 		}
 	}
@@ -191,9 +191,8 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
 
 	if (!attr_only) {
 		const char *head;
-		struct object_id oid;
 
-		head = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
+		head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
 		if (!is_bare_repository() && head && !strcmp(head, ref->buf))
 			die(_("Cannot force update the current branch."));
 	}
@@ -357,8 +356,9 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref,
 
 		if (worktrees[i]->is_detached)
 			continue;
-		if (worktrees[i]->head_ref &&
-		    strcmp(oldref, worktrees[i]->head_ref))
+		if (!worktrees[i]->head_ref)
+			continue;
+		if (strcmp(oldref, worktrees[i]->head_ref))
 			continue;
 
 		refs = get_worktree_ref_store(worktrees[i]);
diff --git a/builtin/add.c b/builtin/add.c
index 5d5773d5c..a648cf4c5 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -116,8 +116,10 @@ int add_files_to_cache(const char *prefix,
 	rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	rev.diffopt.format_callback = update_callback;
 	rev.diffopt.format_callback_data = &data;
+	rev.diffopt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
 	rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
 	run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
+	clear_pathspec(&rev.prune_data);
 	return !!data.add_errors;
 }
 
@@ -513,5 +515,7 @@ finish:
 			die(_("Unable to write new index file"));
 	}
 
+	UNLEAK(pathspec);
+	UNLEAK(dir);
 	return exit_status;
 }
diff --git a/builtin/am.c b/builtin/am.c
index 73f542bec..d7513f537 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -31,6 +31,7 @@
 #include "mailinfo.h"
 #include "apply.h"
 #include "string-list.h"
+#include "packfile.h"
 
 /**
  * Returns 1 if the file is empty or does not exist, 0 otherwise.
@@ -670,9 +671,7 @@ static int detect_patch_format(const char **paths)
 		goto done;
 	}
 
-	strbuf_reset(&l2);
 	strbuf_getline(&l2, fp);
-	strbuf_reset(&l3);
 	strbuf_getline(&l3, fp);
 
 	/*
@@ -695,6 +694,8 @@ static int detect_patch_format(const char **paths)
 done:
 	fclose(fp);
 	strbuf_release(&l1);
+	strbuf_release(&l2);
+	strbuf_release(&l3);
 	return ret;
 }
 
@@ -880,6 +881,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 {
 	struct strbuf sb = STRBUF_INIT;
+	int rc = 0;
 
 	while (!strbuf_getline_lf(&sb, in)) {
 		const char *str;
@@ -893,19 +895,27 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 
 			errno = 0;
 			timestamp = parse_timestamp(str, &end, 10);
-			if (errno)
-				return error(_("invalid timestamp"));
+			if (errno) {
+				rc = error(_("invalid timestamp"));
+				goto exit;
+			}
 
-			if (!skip_prefix(end, " ", &str))
-				return error(_("invalid Date line"));
+			if (!skip_prefix(end, " ", &str)) {
+				rc = error(_("invalid Date line"));
+				goto exit;
+			}
 
 			errno = 0;
 			tz = strtol(str, &end, 10);
-			if (errno)
-				return error(_("invalid timezone offset"));
+			if (errno) {
+				rc = error(_("invalid timezone offset"));
+				goto exit;
+			}
 
-			if (*end)
-				return error(_("invalid Date line"));
+			if (*end) {
+				rc = error(_("invalid Date line"));
+				goto exit;
+			}
 
 			/*
 			 * mercurial's timezone is in seconds west of UTC,
@@ -930,9 +940,9 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 		fwrite(sb.buf, 1, sb.len, out);
 		strbuf_reset(&sb);
 	}
-
+exit:
 	strbuf_release(&sb);
-	return 0;
+	return rc;
 }
 
 /**
@@ -1143,7 +1153,7 @@ static int index_has_changes(struct strbuf *sb)
 	struct object_id head;
 	int i;
 
-	if (!get_sha1_tree("HEAD", head.hash)) {
+	if (!get_oid_tree("HEAD", &head)) {
 		struct diff_options opt;
 
 		diff_setup(&opt);
@@ -1420,7 +1430,7 @@ static void write_index_patch(const struct am_state *state)
 	struct rev_info rev_info;
 	FILE *fp;
 
-	if (!get_sha1_tree("HEAD", head.hash))
+	if (!get_oid_tree("HEAD", &head))
 		tree = lookup_tree(&head);
 	else
 		tree = lookup_tree(&empty_tree_oid);
@@ -1649,7 +1659,7 @@ static void do_commit(const struct am_state *state)
 	if (write_cache_as_tree(tree.hash, 0, NULL))
 		die(_("git write-tree failed to write a tree"));
 
-	if (!get_sha1_commit("HEAD", parent.hash)) {
+	if (!get_oid_commit("HEAD", &parent)) {
 		old_oid = &parent;
 		commit_list_insert(lookup_commit(&parent), &parents);
 	} else {
@@ -2095,6 +2105,7 @@ static int safe_to_abort(const struct am_state *state)
 			die(_("could not parse %s"), am_path(state, "abort-safety"));
 	} else
 		oidclr(&abort_safety);
+	strbuf_release(&sb);
 
 	if (get_oid("HEAD", &head))
 		oidclr(&head);
diff --git a/builtin/blame.c b/builtin/blame.c
index bda1a7872..67adaef4d 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -488,7 +488,7 @@ static int read_ancestry(const char *graft_file)
 		return -1;
 	while (!strbuf_getwholeline(&buf, fp, '\n')) {
 		/* The format is just "Commit Parent1 Parent2 ...\n" */
-		struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
+		struct commit_graft *graft = read_graft_line(&buf);
 		if (graft)
 			register_commit_graft(graft, 0);
 	}
@@ -925,8 +925,7 @@ parse_done:
 	sb.found_guilty_entry = &found_guilty_entry;
 	sb.found_guilty_entry_data = &pi;
 	if (show_progress)
-		pi.progress = start_progress_delay(_("Blaming lines"),
-						   sb.num_lines, 50, 1);
+		pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines);
 
 	assign_blame(&sb, opt);
 
diff --git a/builtin/branch.c b/builtin/branch.c
index 8f779b02b..79dc9181f 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -28,6 +28,7 @@ static const char * const builtin_branch_usage[] = {
 	N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
 	N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
 	N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
+	N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
 	N_("git branch [<options>] [-r | -a] [--points-at]"),
 	N_("git branch [<options>] [-r | -a] [--format]"),
 	NULL
@@ -353,7 +354,7 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
 			strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
 
 		strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
-		strbuf_addf(&local, "%s", branch_get_color(BRANCH_COLOR_RESET));
+		strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));
 		strbuf_addf(&local, " %s ", obname.buf);
 
 		if (filter->verbose > 1)
@@ -457,15 +458,19 @@ static void reject_rebase_or_bisect_branch(const char *target)
 	free_worktrees(worktrees);
 }
 
-static void rename_branch(const char *oldname, const char *newname, int force)
+static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force)
 {
 	struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
 	struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
 	int recovery = 0;
 	int clobber_head_ok;
 
-	if (!oldname)
-		die(_("cannot rename the current branch while not on any."));
+	if (!oldname) {
+		if (copy)
+			die(_("cannot copy the current branch while not on any."));
+		else
+			die(_("cannot rename the current branch while not on any."));
+	}
 
 	if (strbuf_check_branch_ref(&oldref, oldname)) {
 		/*
@@ -488,16 +493,29 @@ static void rename_branch(const char *oldname, const char *newname, int force)
 
 	reject_rebase_or_bisect_branch(oldref.buf);
 
-	strbuf_addf(&logmsg, "Branch: renamed %s to %s",
-		 oldref.buf, newref.buf);
+	if (copy)
+		strbuf_addf(&logmsg, "Branch: copied %s to %s",
+			    oldref.buf, newref.buf);
+	else
+		strbuf_addf(&logmsg, "Branch: renamed %s to %s",
+			    oldref.buf, newref.buf);
 
-	if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
+	if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
 		die(_("Branch rename failed"));
+	if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
+		die(_("Branch copy failed"));
 
-	if (recovery)
-		warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
+	if (recovery) {
+		if (copy)
+			warning(_("Copied a misnamed branch '%s' away"),
+				oldref.buf + 11);
+		else
+			warning(_("Renamed a misnamed branch '%s' away"),
+				oldref.buf + 11);
+	}
 
-	if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
+	if (!copy &&
+	    replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
 		die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
 
 	strbuf_release(&logmsg);
@@ -506,8 +524,10 @@ static void rename_branch(const char *oldname, const char *newname, int force)
 	strbuf_release(&oldref);
 	strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
 	strbuf_release(&newref);
-	if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
+	if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0)
 		die(_("Branch is renamed, but update of config-file failed"));
+	if (copy && strcmp(oldname, newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0)
+		die(_("Branch is copied, but update of config-file failed"));
 	strbuf_release(&oldsection);
 	strbuf_release(&newsection);
 }
@@ -545,7 +565,7 @@ static int edit_branch_description(const char *branch_name)
 
 int cmd_branch(int argc, const char **argv, const char *prefix)
 {
-	int delete = 0, rename = 0, force = 0, list = 0;
+	int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
 	int reflog = 0, edit_description = 0;
 	int quiet = 0, unset_upstream = 0;
 	const char *new_upstream = NULL;
@@ -562,8 +582,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT__QUIET(&quiet, N_("suppress informational messages")),
 		OPT_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
 			BRANCH_TRACK_EXPLICIT),
-		OPT_SET_INT( 0, "set-upstream",  &track, N_("change upstream info"),
-			BRANCH_TRACK_OVERRIDE),
+		{ OPTION_SET_INT, 0, "set-upstream", &track, NULL, N_("do not use"),
+			PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, BRANCH_TRACK_OVERRIDE },
 		OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
 		OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
 		OPT__COLOR(&branch_use_color, N_("use colored output")),
@@ -582,6 +602,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
 		OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
 		OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
+		OPT_BIT('c', "copy", &copy, N_("copy a branch and its reflog"), 1),
+		OPT_BIT('C', NULL, &copy, N_("copy a branch, even if target exists"), 2),
 		OPT_BOOL(0, "list", &list, N_("list branch names")),
 		OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
 		OPT_BOOL(0, "edit-description", &edit_description,
@@ -625,14 +647,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
 			     0);
 
-	if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
+	if (!delete && !rename && !copy && !edit_description && !new_upstream && !unset_upstream && argc == 0)
 		list = 1;
 
 	if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
 	    filter.no_commit)
 		list = 1;
 
-	if (!!delete + !!rename + !!new_upstream +
+	if (!!delete + !!rename + !!copy + !!new_upstream +
 	    list + unset_upstream > 1)
 		usage_with_options(builtin_branch_usage, options);
 
@@ -650,6 +672,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	if (force) {
 		delete *= 2;
 		rename *= 2;
+		copy *= 2;
 	}
 
 	if (delete) {
@@ -704,20 +727,29 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 
 		if (edit_branch_description(branch_name))
 			return 1;
+	} else if (copy) {
+		if (!argc)
+			die(_("branch name required"));
+		else if (argc == 1)
+			copy_or_rename_branch(head, argv[0], 1, copy > 1);
+		else if (argc == 2)
+			copy_or_rename_branch(argv[0], argv[1], 1, copy > 1);
+		else
+			die(_("too many branches for a copy operation"));
 	} else if (rename) {
 		if (!argc)
 			die(_("branch name required"));
 		else if (argc == 1)
-			rename_branch(head, argv[0], rename > 1);
+			copy_or_rename_branch(head, argv[0], 0, rename > 1);
 		else if (argc == 2)
-			rename_branch(argv[0], argv[1], rename > 1);
+			copy_or_rename_branch(argv[0], argv[1], 0, rename > 1);
 		else
-			die(_("too many branches for a rename operation"));
+			die(_("too many arguments for a rename operation"));
 	} else if (new_upstream) {
 		struct branch *branch = branch_get(argv[0]);
 
 		if (argc > 1)
-			die(_("too many branches to set new upstream"));
+			die(_("too many arguments to set new upstream"));
 
 		if (!branch) {
 			if (!argc || !strcmp(argv[0], "HEAD"))
@@ -740,7 +772,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		struct strbuf buf = STRBUF_INIT;
 
 		if (argc > 1)
-			die(_("too many branches to unset upstream"));
+			die(_("too many arguments to unset upstream"));
 
 		if (!branch) {
 			if (!argc || !strcmp(argv[0], "HEAD"))
@@ -760,8 +792,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		strbuf_release(&buf);
 	} else if (argc > 0 && argc <= 2) {
 		struct branch *branch = branch_get(argv[0]);
-		int branch_existed = 0, remote_tracking = 0;
-		struct strbuf buf = STRBUF_INIT;
 
 		if (!strcmp(argv[0], "HEAD"))
 			die(_("it does not make sense to create 'HEAD' manually"));
@@ -773,28 +803,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 			die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
 
 		if (track == BRANCH_TRACK_OVERRIDE)
-			fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
-
-		strbuf_addf(&buf, "refs/remotes/%s", branch->name);
-		remote_tracking = ref_exists(buf.buf);
-		strbuf_release(&buf);
+			die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
 
-		branch_existed = ref_exists(branch->refname);
 		create_branch(argv[0], (argc == 2) ? argv[1] : head,
 			      force, reflog, 0, quiet, track);
 
-		/*
-		 * We only show the instructions if the user gave us
-		 * one branch which doesn't exist locally, but is the
-		 * name of a remote-tracking branch.
-		 */
-		if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
-		    !branch_existed && remote_tracking) {
-			fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
-			fprintf(stderr, "    git branch -d %s\n", branch->name);
-			fprintf(stderr, "    git branch --set-upstream-to %s\n", branch->name);
-		}
-
 	} else
 		usage_with_options(builtin_branch_usage, options);
 
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 188ddc3e5..f5fa4fd75 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -12,6 +12,7 @@
 #include "streaming.h"
 #include "tree-walk.h"
 #include "sha1-array.h"
+#include "packfile.h"
 
 struct batch_options {
 	int enabled;
@@ -63,8 +64,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 	if (unknown_type)
 		flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
 
-	if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
-				  oid.hash, &obj_context))
+	if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
+				 &oid, &obj_context))
 		die("Not a valid object name %s", obj_name);
 
 	if (!path)
@@ -112,6 +113,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
 		if (textconv_object(path, obj_context.mode, &oid, 1, &buf, &size))
 			break;
+		/* else fallthrough */
 
 	case 'p':
 		type = sha1_object_info(oid.hash, NULL);
@@ -361,10 +363,10 @@ static void batch_one_object(const char *obj_name, struct batch_options *opt,
 			     struct expand_data *data)
 {
 	struct object_context ctx;
-	int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;
+	int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0;
 	enum follow_symlinks_result result;
 
-	result = get_sha1_with_context(obj_name, flags, data->oid.hash, &ctx);
+	result = get_oid_with_context(obj_name, flags, &data->oid, &ctx);
 	if (result != FOUND) {
 		switch (result) {
 		case MISSING_OBJECT:
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index eac499450..6c40ff110 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -45,6 +45,7 @@ static int check_ref_format_branch(const char *arg)
 	if (strbuf_check_branch_ref(&sb, arg))
 		die("'%s' is not a valid branch name", arg);
 	printf("%s\n", sb.buf + 11);
+	strbuf_release(&sb);
 	return 0;
 }
 
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2d75ac66c..fc4f8fd2e 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -436,6 +436,7 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 		 * update paths in the work tree, and we cannot revert
 		 * them.
 		 */
+		/* fallthrough */
 	case 0:
 		return 0;
 	default:
@@ -796,9 +797,14 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
 	for_each_ref(add_pending_uninteresting_ref, &revs);
 	add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING);
 
+	/* Save pending objects, so they can be cleaned up later. */
 	refs = revs.pending;
 	revs.leak_pending = 1;
 
+	/*
+	 * prepare_revision_walk (together with .leak_pending = 1) makes us
+	 * the sole owner of the list of pending objects.
+	 */
 	if (prepare_revision_walk(&revs))
 		die(_("internal error in revision walk"));
 	if (!(old->object.flags & UNINTERESTING))
@@ -806,8 +812,10 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
 	else
 		describe_detached_head(_("Previous HEAD position was"), old);
 
+	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
-	free(refs.objects);
+
+	object_array_clear(&refs);
 }
 
 static int switch_branches(const struct checkout_opts *opts,
@@ -861,7 +869,7 @@ static int git_checkout_config(const char *var, const char *value, void *cb)
 	}
 
 	if (starts_with(var, "submodule."))
-		return submodule_config(var, value, NULL);
+		return git_default_submodule_config(var, value, NULL);
 
 	return git_xmerge_config(var, value, NULL);
 }
@@ -1116,9 +1124,8 @@ static int checkout_branch(struct checkout_opts *opts,
 
 	if (new->path && !opts->force_detach && !opts->new_branch &&
 	    !opts->ignore_other_worktrees) {
-		struct object_id oid;
 		int flag;
-		char *head_ref = resolve_refdup("HEAD", 0, oid.hash, &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);
@@ -1182,7 +1189,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 	opts.prefix = prefix;
 	opts.show_progress = -1;
 
-	gitmodules_config();
 	git_config(git_checkout_config, &opts);
 
 	opts.track = BRANCH_TRACK_UNSPECIFIED;
@@ -1291,6 +1297,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		strbuf_release(&buf);
 	}
 
+	UNLEAK(opts);
 	if (opts.patch_mode || opts.pathspec.nr)
 		return checkout_paths(&opts, new.name);
 	else
diff --git a/builtin/clean.c b/builtin/clean.c
index 057fc97fe..189e20628 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -33,15 +33,6 @@ static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
 static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
 static const char *msg_warn_remove_failed = N_("failed to remove %s");
 
-static int clean_use_color = -1;
-static char clean_colors[][COLOR_MAXLEN] = {
-	GIT_COLOR_RESET,
-	GIT_COLOR_NORMAL,	/* PLAIN */
-	GIT_COLOR_BOLD_BLUE,	/* PROMPT */
-	GIT_COLOR_BOLD,		/* HEADER */
-	GIT_COLOR_BOLD_RED,	/* HELP */
-	GIT_COLOR_BOLD_RED,	/* ERROR */
-};
 enum color_clean {
 	CLEAN_COLOR_RESET = 0,
 	CLEAN_COLOR_PLAIN = 1,
@@ -51,6 +42,16 @@ enum color_clean {
 	CLEAN_COLOR_ERROR = 5
 };
 
+static int clean_use_color = -1;
+static char clean_colors[][COLOR_MAXLEN] = {
+	[CLEAN_COLOR_ERROR] = GIT_COLOR_BOLD_RED,
+	[CLEAN_COLOR_HEADER] = GIT_COLOR_BOLD,
+	[CLEAN_COLOR_HELP] = GIT_COLOR_BOLD_RED,
+	[CLEAN_COLOR_PLAIN] = GIT_COLOR_NORMAL,
+	[CLEAN_COLOR_PROMPT] = GIT_COLOR_BOLD_BLUE,
+	[CLEAN_COLOR_RESET] = GIT_COLOR_RESET,
+};
+
 #define MENU_OPTS_SINGLETON		01
 #define MENU_OPTS_IMMEDIATE		02
 #define MENU_OPTS_LIST_ONLY		04
@@ -167,7 +168,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		}
 
 		*dir_gone = 0;
-		return 0;
+		goto out;
 	}
 
 	dir = opendir(path->buf);
@@ -181,7 +182,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			warning_errno(_(msg_warn_remove_failed), quoted.buf);
 			*dir_gone = 0;
 		}
-		return res;
+		ret = res;
+		goto out;
 	}
 
 	strbuf_complete(path, '/');
@@ -249,6 +251,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		for (i = 0; i < dels.nr; i++)
 			printf(dry_run ?  _(msg_would_remove) : _(msg_remove), dels.items[i].string);
 	}
+out:
+	strbuf_release(&quoted);
 	string_list_clear(&dels, 0);
 	return ret;
 }
diff --git a/builtin/clone.c b/builtin/clone.c
index f7e17d229..dbddd98f8 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -25,6 +25,7 @@
 #include "remote.h"
 #include "run-command.h"
 #include "connected.h"
+#include "packfile.h"
 
 /*
  * Overall FIXMEs:
@@ -506,8 +507,8 @@ static void remove_junk(void)
 	if (junk_work_tree) {
 		strbuf_addstr(&sb, junk_work_tree);
 		remove_dir_recursively(&sb, 0);
-		strbuf_reset(&sb);
 	}
+	strbuf_release(&sb);
 }
 
 static void remove_junk_on_signal(int signo)
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index c1de41c67..2177251e2 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -56,7 +56,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 			struct object_id oid;
 			if (argc <= ++i)
 				usage(commit_tree_usage);
-			if (get_sha1_commit(argv[i], oid.hash))
+			if (get_oid_commit(argv[i], &oid))
 				die("Not a valid object name %s", argv[i]);
 			assert_sha1_type(oid.hash, OBJ_COMMIT);
 			new_parent(lookup_commit(&oid), &parents);
@@ -105,7 +105,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 
-		if (get_sha1_tree(arg, tree_oid.hash))
+		if (get_oid_tree(arg, &tree_oid))
 			die("Not a valid object name %s", arg);
 		if (got_tree)
 			die("Cannot give more than one trees");
diff --git a/builtin/commit.c b/builtin/commit.c
index 1a0da71a4..d75b3805e 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -195,7 +195,6 @@ static void determine_whence(struct wt_status *s)
 static void status_init_config(struct wt_status *s, config_fn_t fn)
 {
 	wt_status_prepare(s);
-	gitmodules_config();
 	git_config(fn, s);
 	determine_whence(s);
 	init_diff_ui_defaults();
@@ -336,7 +335,7 @@ static void refresh_cache_or_die(int refresh_flags)
 static const char *prepare_index(int argc, const char **argv, const char *prefix,
 				 const struct commit *current_head, int is_status)
 {
-	struct string_list partial;
+	struct string_list partial = STRING_LIST_INIT_DUP;
 	struct pathspec pathspec;
 	int refresh_flags = REFRESH_QUIET;
 	const char *ret;
@@ -381,7 +380,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 			warning(_("Failed to update main cache tree"));
 
 		commit_style = COMMIT_NORMAL;
-		return get_lock_file_path(&index_lock);
+		ret = get_lock_file_path(&index_lock);
+		goto out;
 	}
 
 	/*
@@ -404,7 +404,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
 			die(_("unable to write new_index file"));
 		commit_style = COMMIT_NORMAL;
-		return get_lock_file_path(&index_lock);
+		ret = get_lock_file_path(&index_lock);
+		goto out;
 	}
 
 	/*
@@ -430,7 +431,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 			rollback_lock_file(&index_lock);
 		}
 		commit_style = COMMIT_AS_IS;
-		return get_index_file();
+		ret = get_index_file();
+		goto out;
 	}
 
 	/*
@@ -461,7 +463,6 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 			die(_("cannot do a partial commit during a cherry-pick."));
 	}
 
-	string_list_init(&partial, 1);
 	if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
 		exit(1);
 
@@ -491,6 +492,9 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 	discard_cache();
 	ret = get_lock_file_path(&false_lock);
 	read_cache_from(ret);
+out:
+	string_list_clear(&partial, 0);
+	clear_pathspec(&pathspec);
 	return ret;
 }
 
@@ -510,7 +514,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
 	s->index_file = index_file;
 	s->fp = fp;
 	s->nowarn = nowarn;
-	s->is_initial = get_sha1(s->reference, oid.hash) ? 1 : 0;
+	s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
 	if (!s->is_initial)
 		hashcpy(s->sha1_commit, oid.hash);
 	s->status_format = status_format;
@@ -891,7 +895,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		if (amend)
 			parent = "HEAD^1";
 
-		if (get_sha1(parent, oid.hash)) {
+		if (get_oid(parent, &oid)) {
 			int i, ita_nr = 0;
 
 			for (i = 0; i < active_nr; i++)
@@ -940,13 +944,16 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		return 0;
 	}
 
-	/*
-	 * Re-read the index as pre-commit hook could have updated it,
-	 * and write it out as a tree.  We must do this before we invoke
-	 * the editor and after we invoke run_status above.
-	 */
-	discard_cache();
+	if (!no_verify && find_hook("pre-commit")) {
+		/*
+		 * Re-read the index as pre-commit hook could have updated it,
+		 * and write it out as a tree.  We must do this before we invoke
+		 * the editor and after we invoke run_status above.
+		 */
+		discard_cache();
+	}
 	read_cache_from(index_file);
+
 	if (update_main_cache_tree(0)) {
 		error(_("Error building trees"));
 		return 0;
@@ -1385,9 +1392,12 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 	read_cache_preload(&s.pathspec);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
 
-	fd = hold_locked_index(&index_lock, 0);
+	if (use_optional_locks())
+		fd = hold_locked_index(&index_lock, 0);
+	else
+		fd = -1;
 
-	s.is_initial = get_sha1(s.reference, oid.hash) ? 1 : 0;
+	s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
 	if (!s.is_initial)
 		hashcpy(s.sha1_commit, oid.hash);
 
@@ -1429,7 +1439,6 @@ static void print_summary(const char *prefix, const struct object_id *oid,
 	struct rev_info rev;
 	struct commit *commit;
 	struct strbuf format = STRBUF_INIT;
-	struct object_id junk_oid;
 	const char *head;
 	struct pretty_print_context pctx = {0};
 	struct strbuf author_ident = STRBUF_INIT;
@@ -1482,7 +1491,7 @@ static void print_summary(const char *prefix, const struct object_id *oid,
 	rev.diffopt.break_opt = 0;
 	diff_setup_done(&rev.diffopt);
 
-	head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
+	head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
 	if (!strcmp(head, "HEAD"))
 		head = _("detached HEAD");
 	else
@@ -1657,7 +1666,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
 	s.colopts = 0;
 
-	if (get_sha1("HEAD", oid.hash))
+	if (get_oid("HEAD", &oid))
 		current_head = NULL;
 	else {
 		current_head = lookup_commit_or_die(&oid, "HEAD");
@@ -1816,6 +1825,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	if (!quiet)
 		print_summary(prefix, &oid, !current_head);
 
-	strbuf_release(&err);
+	UNLEAK(err);
+	UNLEAK(sb);
 	return 0;
 }
diff --git a/builtin/config.c b/builtin/config.c
index 70ff231e9..d13daeeb5 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -518,10 +518,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			die("$HOME not set");
 
 		if (access_or_warn(user_config, R_OK, 0) &&
-		    xdg_config && !access_or_warn(xdg_config, R_OK, 0))
+		    xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
 			given_config_source.file = xdg_config;
-		else
+			free(user_config);
+		} else {
 			given_config_source.file = user_config;
+			free(xdg_config);
+		}
 	}
 	else if (use_system_config)
 		given_config_source.file = git_etc_gitconfig();
@@ -628,6 +631,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_write();
 		check_argc(argc, 2, 2);
 		value = normalize_value(argv[0], argv[1]);
+		UNLEAK(value);
 		ret = git_config_set_in_file_gently(given_config_source.file, argv[0], value);
 		if (ret == CONFIG_NOTHING_SET)
 			error(_("cannot overwrite multiple values with a single value\n"
@@ -638,6 +642,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_write();
 		check_argc(argc, 2, 3);
 		value = normalize_value(argv[0], argv[1]);
+		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
 							      argv[0], value, argv[2], 0);
 	}
@@ -645,6 +650,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_write();
 		check_argc(argc, 2, 2);
 		value = normalize_value(argv[0], argv[1]);
+		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
 							      argv[0], value,
 							      CONFIG_REGEX_NONE, 0);
@@ -653,6 +659,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_write();
 		check_argc(argc, 2, 3);
 		value = normalize_value(argv[0], argv[1]);
+		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
 							      argv[0], value, argv[2], 1);
 	}
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 1d82e61f2..33343818c 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -10,6 +10,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "quote.h"
+#include "packfile.h"
 
 static unsigned long garbage;
 static off_t size_garbage;
diff --git a/builtin/describe.c b/builtin/describe.c
index 94ff2fba0..29075dbd0 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -55,10 +55,13 @@ static const char *prio_names[] = {
 };
 
 static int commit_name_cmp(const void *unused_cmp_data,
-			   const struct commit_name *cn1,
-			   const struct commit_name *cn2,
+			   const void *entry,
+			   const void *entry_or_key,
 			   const void *peeled)
 {
+	const struct commit_name *cn1 = entry;
+	const struct commit_name *cn2 = entry_or_key;
+
 	return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled);
 }
 
@@ -126,13 +129,24 @@ static void add_to_known_names(const char *path,
 
 static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data)
 {
-	int is_tag = starts_with(path, "refs/tags/");
+	int is_tag = 0;
 	struct object_id peeled;
 	int is_annotated, prio;
-
-	/* Reject anything outside refs/tags/ unless --all */
-	if (!all && !is_tag)
+	const char *path_to_match = NULL;
+
+	if (skip_prefix(path, "refs/tags/", &path_to_match)) {
+		is_tag = 1;
+	} else if (all) {
+		if ((exclude_patterns.nr || patterns.nr) &&
+		    !skip_prefix(path, "refs/heads/", &path_to_match) &&
+		    !skip_prefix(path, "refs/remotes/", &path_to_match)) {
+			/* Only accept reference of known type if there are match/exclude patterns */
+			return 0;
+		}
+	} else {
+		/* Reject anything outside refs/tags/ unless --all */
 		return 0;
+	}
 
 	/*
 	 * If we're given exclude patterns, first exclude any tag which match
@@ -141,11 +155,8 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi
 	if (exclude_patterns.nr) {
 		struct string_list_item *item;
 
-		if (!is_tag)
-			return 0;
-
 		for_each_string_list_item(item, &exclude_patterns) {
-			if (!wildmatch(item->string, path + 10, 0))
+			if (!wildmatch(item->string, path_to_match, 0))
 				return 0;
 		}
 	}
@@ -158,11 +169,8 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi
 		int found = 0;
 		struct string_list_item *item;
 
-		if (!is_tag)
-			return 0;
-
 		for_each_string_list_item(item, &patterns) {
-			if (!wildmatch(item->string, path + 10, 0)) {
+			if (!wildmatch(item->string, path_to_match, 0)) {
 				found = 1;
 				break;
 			}
@@ -506,9 +514,9 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 		return cmd_name_rev(args.argc, args.argv, prefix);
 	}
 
-	hashmap_init(&names, (hashmap_cmp_fn) commit_name_cmp, NULL, 0);
+	hashmap_init(&names, commit_name_cmp, NULL, 0);
 	for_each_rawref(get_name, NULL);
-	if (!names.size && !always)
+	if (!hashmap_get_size(&names) && !always)
 		die(_("No names found, cannot describe anything."));
 
 	if (argc == 0) {
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 17bf84d18..e88493ffe 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -26,7 +26,6 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 	init_revisions(&rev, prefix);
-	gitmodules_config();
 	rev.abbrev = 0;
 	precompose_argv(argc, argv);
 
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 185e6f9b5..522f4fdff 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -23,7 +23,6 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 	init_revisions(&rev, prefix);
-	gitmodules_config();
 	rev.abbrev = 0;
 	precompose_argv(argc, argv);
 
@@ -57,5 +56,6 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 		return -1;
 	}
 	result = run_diff_index(&rev, cached);
+	UNLEAK(rev);
 	return diff_result_code(&rev.diffopt, result);
 }
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 31d2cb410..d66499909 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -110,7 +110,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 	init_revisions(opt, prefix);
-	gitmodules_config();
 	opt->abbrev = 0;
 	opt->diff = 1;
 	opt->disable_stdin = 1;
diff --git a/builtin/diff.c b/builtin/diff.c
index 7cde6abbc..f5bbd4d75 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -315,8 +315,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 			no_index = DIFF_NO_INDEX_IMPLICIT;
 	}
 
-	if (!no_index)
-		gitmodules_config();
 	init_diff_ui_defaults();
 	git_config(git_diff_ui_config, NULL);
 	precompose_argv(argc, argv);
@@ -466,5 +464,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	result = diff_result_code(&rev.diffopt, result);
 	if (1 < rev.diffopt.skip_stat_unmatch)
 		refresh_index_quietly();
+	UNLEAK(rev);
+	UNLEAK(ent);
+	UNLEAK(blob);
 	return result;
 }
diff --git a/builtin/difftool.c b/builtin/difftool.c
index a1a26ba89..b2d3ba753 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -111,7 +111,7 @@ static int use_wt_file(const char *workdir, const char *name,
 		int fd = open(buf.buf, O_RDONLY);
 
 		if (fd >= 0 &&
-		    !index_fd(wt_oid.hash, fd, &st, OBJ_BLOB, name, 0)) {
+		    !index_fd(&wt_oid, fd, &st, OBJ_BLOB, name, 0)) {
 			if (is_null_oid(oid)) {
 				oidcpy(oid, &wt_oid);
 				use = 1;
@@ -131,10 +131,12 @@ struct working_tree_entry {
 };
 
 static int working_tree_entry_cmp(const void *unused_cmp_data,
-				  struct working_tree_entry *a,
-				  struct working_tree_entry *b,
-				  void *unused_keydata)
+				  const void *entry,
+				  const void *entry_or_key,
+				  const void *unused_keydata)
 {
+	const struct working_tree_entry *a = entry;
+	const struct working_tree_entry *b = entry_or_key;
 	return strcmp(a->path, b->path);
 }
 
@@ -149,9 +151,13 @@ struct pair_entry {
 };
 
 static int pair_cmp(const void *unused_cmp_data,
-		    struct pair_entry *a, struct pair_entry *b,
-		    void *unused_keydata)
+		    const void *entry,
+		    const void *entry_or_key,
+		    const void *unused_keydata)
 {
+	const struct pair_entry *a = entry;
+	const struct pair_entry *b = entry_or_key;
+
 	return strcmp(a->path, b->path);
 }
 
@@ -179,9 +185,13 @@ struct path_entry {
 };
 
 static int path_entry_cmp(const void *unused_cmp_data,
-			  struct path_entry *a, struct path_entry *b,
-			  void *key)
+			  const void *entry,
+			  const void *entry_or_key,
+			  const void *key)
 {
+	const struct path_entry *a = entry;
+	const struct path_entry *b = entry_or_key;
+
 	return strcmp(a->path, key ? key : b->path);
 }
 
@@ -372,10 +382,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	rdir_len = rdir.len;
 	wtdir_len = wtdir.len;
 
-	hashmap_init(&working_tree_dups,
-		     (hashmap_cmp_fn)working_tree_entry_cmp, NULL, 0);
-	hashmap_init(&submodules, (hashmap_cmp_fn)pair_cmp, NULL, 0);
-	hashmap_init(&symlinks2, (hashmap_cmp_fn)pair_cmp, NULL, 0);
+	hashmap_init(&working_tree_dups, working_tree_entry_cmp, NULL, 0);
+	hashmap_init(&submodules, pair_cmp, NULL, 0);
+	hashmap_init(&symlinks2, pair_cmp, NULL, 0);
 
 	child.no_stdin = 1;
 	child.git_cmd = 1;
@@ -585,10 +594,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	 * in the common case of --symlinks and the difftool updating
 	 * files through the symlink.
 	 */
-	hashmap_init(&wt_modified, (hashmap_cmp_fn)path_entry_cmp,
-		     NULL, wtindex.cache_nr);
-	hashmap_init(&tmp_modified, (hashmap_cmp_fn)path_entry_cmp,
-		     NULL, wtindex.cache_nr);
+	hashmap_init(&wt_modified, path_entry_cmp, NULL, wtindex.cache_nr);
+	hashmap_init(&tmp_modified, path_entry_cmp, NULL, wtindex.cache_nr);
 
 	for (i = 0; i < wtindex.cache_nr; i++) {
 		struct hashmap_entry dummy;
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d412c0a8f..2fb60d6d4 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -344,6 +344,7 @@ static void show_filemodify(struct diff_queue_struct *q,
 			    struct diff_options *options, void *data)
 {
 	int i;
+	struct string_list *changed = data;
 
 	/*
 	 * Handle files below a directory first, in case they are all deleted
@@ -359,20 +360,31 @@ static void show_filemodify(struct diff_queue_struct *q,
 		case DIFF_STATUS_DELETED:
 			printf("D ");
 			print_path(spec->path);
+			string_list_insert(changed, spec->path);
 			putchar('\n');
 			break;
 
 		case DIFF_STATUS_COPIED:
 		case DIFF_STATUS_RENAMED:
-			printf("%c ", q->queue[i]->status);
-			print_path(ospec->path);
-			putchar(' ');
-			print_path(spec->path);
-			putchar('\n');
-
-			if (!oidcmp(&ospec->oid, &spec->oid) &&
-			    ospec->mode == spec->mode)
-				break;
+			/*
+			 * If a change in the file corresponding to ospec->path
+			 * has been observed, we cannot trust its contents
+			 * because the diff is calculated based on the prior
+			 * contents, not the current contents.  So, declare a
+			 * copy or rename only if there was no change observed.
+			 */
+			if (!string_list_has_string(changed, ospec->path)) {
+				printf("%c ", q->queue[i]->status);
+				print_path(ospec->path);
+				putchar(' ');
+				print_path(spec->path);
+				string_list_insert(changed, spec->path);
+				putchar('\n');
+
+				if (!oidcmp(&ospec->oid, &spec->oid) &&
+				    ospec->mode == spec->mode)
+					break;
+			}
 			/* fallthrough */
 
 		case DIFF_STATUS_TYPE_CHANGED:
@@ -393,6 +405,7 @@ static void show_filemodify(struct diff_queue_struct *q,
 				       get_object_mark(object));
 			}
 			print_path(spec->path);
+			string_list_insert(changed, spec->path);
 			putchar('\n');
 			break;
 
@@ -528,7 +541,8 @@ static void anonymize_ident_line(const char **beg, const char **end)
 	*end = out->buf + out->len;
 }
 
-static void handle_commit(struct commit *commit, struct rev_info *rev)
+static void handle_commit(struct commit *commit, struct rev_info *rev,
+			  struct string_list *paths_of_changed_objects)
 {
 	int saved_output_format = rev->diffopt.output_format;
 	const char *commit_buffer;
@@ -615,6 +629,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
 	if (full_tree)
 		printf("deleteall\n");
 	log_tree_diff_flush(rev);
+	string_list_clear(paths_of_changed_objects, 0);
 	rev->diffopt.output_format = saved_output_format;
 
 	printf("\n");
@@ -630,15 +645,15 @@ static void *anonymize_tag(const void *old, size_t *len)
 	return strbuf_detach(&out, len);
 }
 
-static void handle_tail(struct object_array *commits, struct rev_info *revs)
+static void handle_tail(struct object_array *commits, struct rev_info *revs,
+			struct string_list *paths_of_changed_objects)
 {
 	struct commit *commit;
 	while (commits->nr) {
-		commit = (struct commit *)commits->objects[commits->nr - 1].item;
+		commit = (struct commit *)object_array_pop(commits);
 		if (has_unshown_parent(commit))
 			return;
-		handle_commit(commit, revs);
-		commits->nr--;
+		handle_commit(commit, revs, paths_of_changed_objects);
 	}
 }
 
@@ -977,6 +992,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	char *export_filename = NULL, *import_filename = NULL;
 	uint32_t lastimportid;
 	struct string_list refspecs_list = STRING_LIST_INIT_NODUP;
+	struct string_list paths_of_changed_objects = STRING_LIST_INIT_DUP;
 	struct option options[] = {
 		OPT_INTEGER(0, "progress", &progress,
 			    N_("show progress after <n> objects")),
@@ -1049,14 +1065,15 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	if (prepare_revision_walk(&revs))
 		die("revision walk setup failed");
 	revs.diffopt.format_callback = show_filemodify;
+	revs.diffopt.format_callback_data = &paths_of_changed_objects;
 	DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
 	while ((commit = get_revision(&revs))) {
 		if (has_unshown_parent(commit)) {
 			add_object_array(&commit->object, NULL, &commits);
 		}
 		else {
-			handle_commit(commit, &revs);
-			handle_tail(&commits, &revs);
+			handle_commit(commit, &revs, &paths_of_changed_objects);
+			handle_tail(&commits, &revs, &paths_of_changed_objects);
 		}
 	}
 
diff --git a/builtin/fetch.c b/builtin/fetch.c
index c87e59f3b..225c73492 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -17,6 +17,7 @@
 #include "connected.h"
 #include "argv-array.h"
 #include "utf8.h"
+#include "packfile.h"
 
 static const char * const builtin_fetch_usage[] = {
 	N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -39,7 +40,7 @@ static int prune = -1; /* unspecified */
 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;
-static int max_children = -1;
+static int max_children = 1;
 static enum transport_family family;
 static const char *depth;
 static const char *deepen_since;
@@ -68,9 +69,30 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
 		recurse_submodules = r;
 	}
 
+	if (!strcmp(k, "submodule.fetchjobs")) {
+		max_children = parse_submodule_fetchjobs(k, v);
+		return 0;
+	} else if (!strcmp(k, "fetch.recursesubmodules")) {
+		recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
+		return 0;
+	}
+
 	return git_default_config(k, v, cb);
 }
 
+static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
+{
+	if (!strcmp(var, "submodule.fetchjobs")) {
+		max_children = parse_submodule_fetchjobs(var, value);
+		return 0;
+	} else if (!strcmp(var, "fetch.recursesubmodules")) {
+		recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
+		return 0;
+	}
+
+	return 0;
+}
+
 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
 {
 	ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
@@ -1311,6 +1333,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	for (i = 1; i < argc; i++)
 		strbuf_addf(&default_rla, " %s", argv[i]);
 
+	config_from_gitmodules(gitmodules_fetch_config, NULL);
 	git_config(git_fetch_config, NULL);
 
 	argc = parse_options(argc, argv, prefix,
@@ -1338,12 +1361,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (depth || deepen_since || deepen_not.nr)
 		deepen = 1;
 
-	if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
-		set_config_fetch_recurse_submodules(recurse_submodules_default);
-		gitmodules_config();
-		git_config(submodule_config, NULL);
-	}
-
 	if (all) {
 		if (argc == 1)
 			die(_("fetch --all does not take a repository argument"));
@@ -1383,6 +1400,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		result = fetch_populated_submodules(&options,
 						    submodule_prefix,
 						    recurse_submodules,
+						    recurse_submodules_default,
 						    verbosity < 0,
 						    max_children);
 		argv_array_clear(&options);
diff --git a/builtin/fsck.c b/builtin/fsck.c
index d18244ab5..56afe405b 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -15,6 +15,7 @@
 #include "progress.h"
 #include "streaming.h"
 #include "decorate.h"
+#include "packfile.h"
 
 #define REACHABLE 0x0001
 #define SEEN      0x0002
@@ -179,14 +180,9 @@ static int traverse_reachable(void)
 	unsigned int nr = 0;
 	int result = 0;
 	if (show_progress)
-		progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2);
+		progress = start_delayed_progress(_("Checking connectivity"), 0);
 	while (pending.nr) {
-		struct object_array_entry *entry;
-		struct object *obj;
-
-		entry = pending.objects + --pending.nr;
-		obj = entry->item;
-		result |= traverse_one_object(obj);
+		result |= traverse_one_object(object_array_pop(&pending));
 		display_progress(progress, ++nr);
 	}
 	stop_progress(&progress);
@@ -730,12 +726,12 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
 	for (i = 0; i < argc; i++) {
 		const char *arg = argv[i];
-		unsigned char sha1[20];
-		if (!get_sha1(arg, sha1)) {
-			struct object *obj = lookup_object(sha1);
+		struct object_id oid;
+		if (!get_oid(arg, &oid)) {
+			struct object *obj = lookup_object(oid.hash);
 
 			if (!obj || !(obj->flags & HAS_OBJ)) {
-				error("%s: object missing", sha1_to_hex(sha1));
+				error("%s: object missing", oid_to_hex(&oid));
 				errors_found |= ERROR_OBJECT;
 				continue;
 			}
diff --git a/builtin/gc.c b/builtin/gc.c
index 53c19be8b..3c5eae0ed 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -19,6 +19,7 @@
 #include "sigchain.h"
 #include "argv-array.h"
 #include "commit.h"
+#include "packfile.h"
 
 #define FAILED_RUN "failed to run %s"
 
@@ -46,7 +47,7 @@ static struct argv_array prune = ARGV_ARRAY_INIT;
 static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
 static struct argv_array rerere = ARGV_ARRAY_INIT;
 
-static struct tempfile pidfile;
+static struct tempfile *pidfile;
 static struct lock_file log_lock;
 
 static struct string_list pack_garbage = STRING_LIST_INIT_DUP;
@@ -77,7 +78,7 @@ static void process_log_file(void)
 		 */
 		int saved_errno = errno;
 		fprintf(stderr, _("Failed to fstat %s: %s"),
-			get_tempfile_path(&log_lock.tempfile),
+			get_tempfile_path(log_lock.tempfile),
 			strerror(saved_errno));
 		fflush(stderr);
 		commit_lock_file(&log_lock);
@@ -241,7 +242,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 	int fd;
 	char *pidfile_path;
 
-	if (is_tempfile_active(&pidfile))
+	if (is_tempfile_active(pidfile))
 		/* already locked */
 		return NULL;
 
@@ -292,7 +293,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 	write_in_full(fd, sb.buf, sb.len);
 	strbuf_release(&sb);
 	commit_lock_file(&lock);
-	register_tempfile(&pidfile, pidfile_path);
+	pidfile = register_tempfile(pidfile_path);
 	free(pidfile_path);
 	return NULL;
 }
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index e21c5416c..2706fcfaf 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -26,15 +26,16 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
 		usage(builtin_get_tar_commit_id_usage);
 
 	n = read_in_full(0, buffer, HEADERSIZE);
-	if (n < HEADERSIZE)
-		die("git get-tar-commit-id: read error");
+	if (n < 0)
+		die_errno("git get-tar-commit-id: read error");
+	if (n != HEADERSIZE)
+		die_errno("git get-tar-commit-id: EOF before reading tar header");
 	if (header->typeflag[0] != 'g')
 		return 1;
 	if (!skip_prefix(content, "52 comment=", &comment))
 		return 1;
 
-	n = write_in_full(1, comment, 41);
-	if (n < 41)
+	if (write_in_full(1, comment, 41) < 0)
 		die_errno("git get-tar-commit-id: write error");
 
 	return 0;
diff --git a/builtin/grep.c b/builtin/grep.c
index 7e79eb1a7..2d65f27d0 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -28,13 +28,7 @@ static char const * const grep_usage[] = {
 	NULL
 };
 
-static const char *super_prefix;
 static int recurse_submodules;
-static struct argv_array submodule_options = ARGV_ARRAY_INIT;
-static const char *parent_basename;
-
-static int grep_submodule_launch(struct grep_opt *opt,
-				 const struct grep_source *gs);
 
 #define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
@@ -186,10 +180,7 @@ static void *run(void *arg)
 			break;
 
 		opt->output_priv = w;
-		if (w->source.type == GREP_SOURCE_SUBMODULE)
-			hit |= grep_submodule_launch(opt, &w->source);
-		else
-			hit |= grep_source(opt, &w->source);
+		hit |= grep_source(opt, &w->source);
 		grep_source_clear_data(&w->source);
 		work_done(w);
 	}
@@ -327,21 +318,13 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 {
 	struct strbuf pathbuf = STRBUF_INIT;
 
-	if (super_prefix) {
-		strbuf_add(&pathbuf, filename, tree_name_len);
-		strbuf_addstr(&pathbuf, super_prefix);
-		strbuf_addstr(&pathbuf, filename + tree_name_len);
+	if (opt->relative && opt->prefix_length) {
+		quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf);
+		strbuf_insert(&pathbuf, 0, filename, tree_name_len);
 	} else {
 		strbuf_addstr(&pathbuf, filename);
 	}
 
-	if (opt->relative && opt->prefix_length) {
-		char *name = strbuf_detach(&pathbuf, NULL);
-		quote_path_relative(name + tree_name_len, opt->prefix, &pathbuf);
-		strbuf_insert(&pathbuf, 0, name, tree_name_len);
-		free(name);
-	}
-
 #ifndef NO_PTHREADS
 	if (num_threads) {
 		add_work(opt, GREP_SOURCE_OID, pathbuf.buf, path, oid);
@@ -366,15 +349,10 @@ static int grep_file(struct grep_opt *opt, const char *filename)
 {
 	struct strbuf buf = STRBUF_INIT;
 
-	if (super_prefix)
-		strbuf_addstr(&buf, super_prefix);
-	strbuf_addstr(&buf, filename);
-
-	if (opt->relative && opt->prefix_length) {
-		char *name = strbuf_detach(&buf, NULL);
-		quote_path_relative(name, opt->prefix, &buf);
-		free(name);
-	}
+	if (opt->relative && opt->prefix_length)
+		quote_path_relative(filename, opt->prefix, &buf);
+	else
+		strbuf_addstr(&buf, filename);
 
 #ifndef NO_PTHREADS
 	if (num_threads) {
@@ -421,284 +399,89 @@ static void run_pager(struct grep_opt *opt, const char *prefix)
 		exit(status);
 }
 
-static void compile_submodule_options(const struct grep_opt *opt,
-				      const char **argv,
-				      int cached, int untracked,
-				      int opt_exclude, int use_index,
-				      int pattern_type_arg)
-{
-	struct grep_pat *pattern;
-
-	if (recurse_submodules)
-		argv_array_push(&submodule_options, "--recurse-submodules");
-
-	if (cached)
-		argv_array_push(&submodule_options, "--cached");
-	if (!use_index)
-		argv_array_push(&submodule_options, "--no-index");
-	if (untracked)
-		argv_array_push(&submodule_options, "--untracked");
-	if (opt_exclude > 0)
-		argv_array_push(&submodule_options, "--exclude-standard");
-
-	if (opt->invert)
-		argv_array_push(&submodule_options, "-v");
-	if (opt->ignore_case)
-		argv_array_push(&submodule_options, "-i");
-	if (opt->word_regexp)
-		argv_array_push(&submodule_options, "-w");
-	switch (opt->binary) {
-	case GREP_BINARY_NOMATCH:
-		argv_array_push(&submodule_options, "-I");
-		break;
-	case GREP_BINARY_TEXT:
-		argv_array_push(&submodule_options, "-a");
-		break;
-	default:
-		break;
-	}
-	if (opt->allow_textconv)
-		argv_array_push(&submodule_options, "--textconv");
-	if (opt->max_depth != -1)
-		argv_array_pushf(&submodule_options, "--max-depth=%d",
-				 opt->max_depth);
-	if (opt->linenum)
-		argv_array_push(&submodule_options, "-n");
-	if (!opt->pathname)
-		argv_array_push(&submodule_options, "-h");
-	if (!opt->relative)
-		argv_array_push(&submodule_options, "--full-name");
-	if (opt->name_only)
-		argv_array_push(&submodule_options, "-l");
-	if (opt->unmatch_name_only)
-		argv_array_push(&submodule_options, "-L");
-	if (opt->null_following_name)
-		argv_array_push(&submodule_options, "-z");
-	if (opt->count)
-		argv_array_push(&submodule_options, "-c");
-	if (opt->file_break)
-		argv_array_push(&submodule_options, "--break");
-	if (opt->heading)
-		argv_array_push(&submodule_options, "--heading");
-	if (opt->pre_context)
-		argv_array_pushf(&submodule_options, "--before-context=%d",
-				 opt->pre_context);
-	if (opt->post_context)
-		argv_array_pushf(&submodule_options, "--after-context=%d",
-				 opt->post_context);
-	if (opt->funcname)
-		argv_array_push(&submodule_options, "-p");
-	if (opt->funcbody)
-		argv_array_push(&submodule_options, "-W");
-	if (opt->all_match)
-		argv_array_push(&submodule_options, "--all-match");
-	if (opt->debug)
-		argv_array_push(&submodule_options, "--debug");
-	if (opt->status_only)
-		argv_array_push(&submodule_options, "-q");
-
-	switch (pattern_type_arg) {
-	case GREP_PATTERN_TYPE_BRE:
-		argv_array_push(&submodule_options, "-G");
-		break;
-	case GREP_PATTERN_TYPE_ERE:
-		argv_array_push(&submodule_options, "-E");
-		break;
-	case GREP_PATTERN_TYPE_FIXED:
-		argv_array_push(&submodule_options, "-F");
-		break;
-	case GREP_PATTERN_TYPE_PCRE:
-		argv_array_push(&submodule_options, "-P");
-		break;
-	case GREP_PATTERN_TYPE_UNSPECIFIED:
-		break;
-	default:
-		die("BUG: Added a new grep pattern type without updating switch statement");
-	}
-
-	for (pattern = opt->pattern_list; pattern != NULL;
-	     pattern = pattern->next) {
-		switch (pattern->token) {
-		case GREP_PATTERN:
-			argv_array_pushf(&submodule_options, "-e%s",
-					 pattern->pattern);
-			break;
-		case GREP_AND:
-		case GREP_OPEN_PAREN:
-		case GREP_CLOSE_PAREN:
-		case GREP_NOT:
-		case GREP_OR:
-			argv_array_push(&submodule_options, pattern->pattern);
-			break;
-		/* BODY and HEAD are not used by git-grep */
-		case GREP_PATTERN_BODY:
-		case GREP_PATTERN_HEAD:
-			break;
-		}
-	}
-
-	/*
-	 * Limit number of threads for child process to use.
-	 * This is to prevent potential fork-bomb behavior of git-grep as each
-	 * submodule process has its own thread pool.
-	 */
-	argv_array_pushf(&submodule_options, "--threads=%d",
-			 DIV_ROUND_UP(num_threads, 2));
-
-	/* Add Pathspecs */
-	argv_array_push(&submodule_options, "--");
-	for (; *argv; argv++)
-		argv_array_push(&submodule_options, *argv);
-}
+static int grep_cache(struct grep_opt *opt, struct repository *repo,
+		      const struct pathspec *pathspec, int cached);
+static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
+		     struct tree_desc *tree, struct strbuf *base, int tn_len,
+		     int check_attr, struct repository *repo);
 
-/*
- * Launch child process to grep contents of a submodule
- */
-static int grep_submodule_launch(struct grep_opt *opt,
-				 const struct grep_source *gs)
+static int grep_submodule(struct grep_opt *opt, struct repository *superproject,
+			  const struct pathspec *pathspec,
+			  const struct object_id *oid,
+			  const char *filename, const char *path)
 {
-	struct child_process cp = CHILD_PROCESS_INIT;
-	int status, i;
-	const char *end_of_base;
-	const char *name;
-	struct strbuf child_output = STRBUF_INIT;
-
-	end_of_base = strchr(gs->name, ':');
-	if (gs->identifier && end_of_base)
-		name = end_of_base + 1;
-	else
-		name = gs->name;
+	struct repository submodule;
+	int hit;
 
-	prepare_submodule_repo_env(&cp.env_array);
-	argv_array_push(&cp.env_array, GIT_DIR_ENVIRONMENT);
+	if (!is_submodule_active(superproject, path))
+		return 0;
 
-	if (opt->relative && opt->prefix_length)
-		argv_array_pushf(&cp.env_array, "%s=%s",
-				 GIT_TOPLEVEL_PREFIX_ENVIRONMENT,
-				 opt->prefix);
+	if (repo_submodule_init(&submodule, superproject, path))
+		return 0;
 
-	/* Add super prefix */
-	argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
-			 super_prefix ? super_prefix : "",
-			 name);
-	argv_array_push(&cp.args, "grep");
+	repo_read_gitmodules(&submodule);
 
 	/*
-	 * Add basename of parent project
-	 * When performing grep on a tree object the filename is prefixed
-	 * with the object's name: 'tree-name:filename'.  In order to
-	 * provide uniformity of output we want to pass the name of the
-	 * parent project's object name to the submodule so the submodule can
-	 * prefix its output with the parent's name and not its own OID.
+	 * NEEDSWORK: This adds the submodule's object directory to the list of
+	 * alternates for the single in-memory object store.  This has some bad
+	 * consequences for memory (processed objects will never be freed) and
+	 * performance (this increases the number of pack files git has to pay
+	 * attention to, to the sum of the number of pack files in all the
+	 * repositories processed so far).  This can be removed once the object
+	 * store is no longer global and instead is a member of the repository
+	 * object.
 	 */
-	if (gs->identifier && end_of_base)
-		argv_array_pushf(&cp.args, "--parent-basename=%.*s",
-				 (int) (end_of_base - gs->name),
-				 gs->name);
+	add_to_alternates_memory(submodule.objectdir);
 
-	/* Add options */
-	for (i = 0; i < submodule_options.argc; i++) {
-		/*
-		 * If there is a tree identifier for the submodule, add the
-		 * rev after adding the submodule options but before the
-		 * pathspecs.  To do this we listen for the '--' and insert the
-		 * oid before pushing the '--' onto the child process argv
-		 * array.
-		 */
-		if (gs->identifier &&
-		    !strcmp("--", submodule_options.argv[i])) {
-			argv_array_push(&cp.args, oid_to_hex(gs->identifier));
-		}
+	if (oid) {
+		struct object *object;
+		struct tree_desc tree;
+		void *data;
+		unsigned long size;
+		struct strbuf base = STRBUF_INIT;
 
-		argv_array_push(&cp.args, submodule_options.argv[i]);
-	}
+		object = parse_object_or_die(oid, oid_to_hex(oid));
 
-	cp.git_cmd = 1;
-	cp.dir = gs->path;
+		grep_read_lock();
+		data = read_object_with_reference(object->oid.hash, tree_type,
+						  &size, NULL);
+		grep_read_unlock();
 
-	/*
-	 * Capture output to output buffer and check the return code from the
-	 * child process.  A '0' indicates a hit, a '1' indicates no hit and
-	 * anything else is an error.
-	 */
-	status = capture_command(&cp, &child_output, 0);
-	if (status && (status != 1)) {
-		/* flush the buffer */
-		write_or_die(1, child_output.buf, child_output.len);
-		die("process for submodule '%s' failed with exit code: %d",
-		    gs->name, status);
-	}
+		if (!data)
+			die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
 
-	opt->output(opt, child_output.buf, child_output.len);
-	strbuf_release(&child_output);
-	/* invert the return code to make a hit equal to 1 */
-	return !status;
-}
+		strbuf_addstr(&base, filename);
+		strbuf_addch(&base, '/');
 
-/*
- * Prep grep structures for a submodule grep
- * oid: the oid of the submodule or NULL if using the working tree
- * filename: name of the submodule including tree name of parent
- * path: location of the submodule
- */
-static int grep_submodule(struct grep_opt *opt, const struct object_id *oid,
-			  const char *filename, const char *path)
-{
-	if (!is_submodule_active(the_repository, path))
-		return 0;
-	if (!is_submodule_populated_gently(path, NULL)) {
-		/*
-		 * If searching history, check for the presence of the
-		 * submodule's gitdir before skipping the submodule.
-		 */
-		if (oid) {
-			const struct submodule *sub =
-					submodule_from_path(null_sha1, path);
-			if (sub)
-				path = git_path("modules/%s", sub->name);
-
-			if (!(is_directory(path) && is_git_directory(path)))
-				return 0;
-		} else {
-			return 0;
-		}
+		init_tree_desc(&tree, data, size);
+		hit = grep_tree(opt, pathspec, &tree, &base, base.len,
+				object->type == OBJ_COMMIT, &submodule);
+		strbuf_release(&base);
+		free(data);
+	} else {
+		hit = grep_cache(opt, &submodule, pathspec, 1);
 	}
 
-#ifndef NO_PTHREADS
-	if (num_threads) {
-		add_work(opt, GREP_SOURCE_SUBMODULE, filename, path, oid);
-		return 0;
-	} else
-#endif
-	{
-		struct grep_source gs;
-		int hit;
-
-		grep_source_init(&gs, GREP_SOURCE_SUBMODULE,
-				 filename, path, oid);
-		hit = grep_submodule_launch(opt, &gs);
-
-		grep_source_clear(&gs);
-		return hit;
-	}
+	repo_clear(&submodule);
+	return hit;
 }
 
-static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
-		      int cached)
+static int grep_cache(struct grep_opt *opt, struct repository *repo,
+		      const struct pathspec *pathspec, int cached)
 {
 	int hit = 0;
 	int nr;
 	struct strbuf name = STRBUF_INIT;
 	int name_base_len = 0;
-	if (super_prefix) {
-		name_base_len = strlen(super_prefix);
-		strbuf_addstr(&name, super_prefix);
+	if (repo->submodule_prefix) {
+		name_base_len = strlen(repo->submodule_prefix);
+		strbuf_addstr(&name, repo->submodule_prefix);
 	}
 
-	read_cache();
+	repo_read_index(repo);
 
-	for (nr = 0; nr < active_nr; nr++) {
-		const struct cache_entry *ce = active_cache[nr];
+	for (nr = 0; nr < repo->index->cache_nr; nr++) {
+		const struct cache_entry *ce = repo->index->cache[nr];
 		strbuf_setlen(&name, name_base_len);
 		strbuf_addstr(&name, ce->name);
 
@@ -715,14 +498,14 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
 			    ce_skip_worktree(ce)) {
 				if (ce_stage(ce) || ce_intent_to_add(ce))
 					continue;
-				hit |= grep_oid(opt, &ce->oid, ce->name,
-						 0, ce->name);
+				hit |= grep_oid(opt, &ce->oid, name.buf,
+						 0, name.buf);
 			} else {
-				hit |= grep_file(opt, ce->name);
+				hit |= grep_file(opt, name.buf);
 			}
 		} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
 			   submodule_path_match(pathspec, name.buf, NULL)) {
-			hit |= grep_submodule(opt, NULL, ce->name, ce->name);
+			hit |= grep_submodule(opt, repo, pathspec, NULL, ce->name, ce->name);
 		} else {
 			continue;
 		}
@@ -730,8 +513,8 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
 		if (ce_stage(ce)) {
 			do {
 				nr++;
-			} while (nr < active_nr &&
-				 !strcmp(ce->name, active_cache[nr]->name));
+			} while (nr < repo->index->cache_nr &&
+				 !strcmp(ce->name, repo->index->cache[nr]->name));
 			nr--; /* compensate for loop control */
 		}
 		if (hit && opt->status_only)
@@ -744,7 +527,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
 
 static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 		     struct tree_desc *tree, struct strbuf *base, int tn_len,
-		     int check_attr)
+		     int check_attr, struct repository *repo)
 {
 	int hit = 0;
 	enum interesting match = entry_not_interesting;
@@ -752,8 +535,8 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 	int old_baselen = base->len;
 	struct strbuf name = STRBUF_INIT;
 	int name_base_len = 0;
-	if (super_prefix) {
-		strbuf_addstr(&name, super_prefix);
+	if (repo->submodule_prefix) {
+		strbuf_addstr(&name, repo->submodule_prefix);
 		name_base_len = name.len;
 	}
 
@@ -791,11 +574,11 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 			strbuf_addch(base, '/');
 			init_tree_desc(&sub, data, size);
 			hit |= grep_tree(opt, pathspec, &sub, base, tn_len,
-					 check_attr);
+					 check_attr, repo);
 			free(data);
 		} else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
-			hit |= grep_submodule(opt, entry.oid, base->buf,
-					      base->buf + tn_len);
+			hit |= grep_submodule(opt, repo, pathspec, entry.oid,
+					      base->buf, base->buf + tn_len);
 		}
 
 		strbuf_setlen(base, old_baselen);
@@ -809,7 +592,8 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 }
 
 static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
-		       struct object *obj, const char *name, const char *path)
+		       struct object *obj, const char *name, const char *path,
+		       struct repository *repo)
 {
 	if (obj->type == OBJ_BLOB)
 		return grep_oid(opt, &obj->oid, name, 0, path);
@@ -828,10 +612,6 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		if (!data)
 			die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid));
 
-		/* Use parent's name as base when recursing submodules */
-		if (recurse_submodules && parent_basename)
-			name = parent_basename;
-
 		len = name ? strlen(name) : 0;
 		strbuf_init(&base, PATH_MAX + len + 1);
 		if (len) {
@@ -840,7 +620,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		}
 		init_tree_desc(&tree, data, size);
 		hit = grep_tree(opt, pathspec, &tree, &base, base.len,
-				obj->type == OBJ_COMMIT);
+				obj->type == OBJ_COMMIT, repo);
 		strbuf_release(&base);
 		free(data);
 		return hit;
@@ -849,6 +629,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 }
 
 static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
+			struct repository *repo,
 			const struct object_array *list)
 {
 	unsigned int i;
@@ -862,9 +643,10 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
 		/* load the gitmodules file for this rev */
 		if (recurse_submodules) {
 			submodule_free();
-			gitmodules_config_sha1(real_obj->oid.hash);
+			gitmodules_config_oid(&real_obj->oid);
 		}
-		if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path)) {
+		if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path,
+				repo)) {
 			hit = 1;
 			if (opt->status_only)
 				break;
@@ -1005,9 +787,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			    N_("ignore files specified via '.gitignore'"), 1),
 		OPT_BOOL(0, "recurse-submodules", &recurse_submodules,
 			 N_("recursively search in each submodule")),
-		OPT_STRING(0, "parent-basename", &parent_basename,
-			   N_("basename"),
-			   N_("prepend parent project's basename to output")),
 		OPT_GROUP(""),
 		OPT_BOOL('v', "invert-match", &opt.invert,
 			N_("show non-matching lines")),
@@ -1112,7 +891,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	init_grep_defaults();
 	git_config(grep_cmd_config, NULL);
 	grep_init(&opt, prefix);
-	super_prefix = get_super_prefix();
 
 	/*
 	 * If there is no -- then the paths must exist in the working
@@ -1205,8 +983,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			break;
 		}
 
-		if (get_sha1_with_context(arg, GET_SHA1_RECORD_PATH,
-					  oid.hash, &oc)) {
+		if (get_oid_with_context(arg, GET_OID_RECORD_PATH,
+					 &oid, &oc)) {
 			if (seen_dashdash)
 				die(_("unable to resolve revision: %s"), arg);
 			break;
@@ -1270,13 +1048,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	}
 #endif
 
-	if (recurse_submodules) {
-		gitmodules_config();
-		compile_submodule_options(&opt, argv + i, cached, untracked,
-					  opt_exclude, use_index,
-					  pattern_type_arg);
-	}
-
 	if (show_in_pager && (cached || list.nr))
 		die(_("--open-files-in-pager only works on the worktree"));
 
@@ -1318,11 +1089,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		if (!cached)
 			setup_work_tree();
 
-		hit = grep_cache(&opt, &pathspec, cached);
+		hit = grep_cache(&opt, the_repository, &pathspec, cached);
 	} else {
 		if (cached)
 			die(_("both --cached and trees are given."));
-		hit = grep_objects(&opt, &pathspec, &list);
+
+		hit = grep_objects(&opt, &pathspec, the_repository, &list);
 	}
 
 	if (num_threads)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index d04baf999..c532ff932 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -16,7 +16,7 @@
  * needs to bypass the data conversion performed by, and the type
  * limitation imposed by, index_fd() and its callees.
  */
-static int hash_literally(unsigned char *sha1, int fd, const char *type, unsigned flags)
+static int hash_literally(struct object_id *oid, int fd, const char *type, unsigned flags)
 {
 	struct strbuf buf = STRBUF_INIT;
 	int ret;
@@ -24,7 +24,7 @@ static int hash_literally(unsigned char *sha1, int fd, const char *type, unsigne
 	if (strbuf_read(&buf, fd, 4096) < 0)
 		ret = -1;
 	else
-		ret = hash_sha1_file_literally(buf.buf, buf.len, type, sha1, flags);
+		ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
 	strbuf_release(&buf);
 	return ret;
 }
@@ -33,16 +33,16 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
 		    int literally)
 {
 	struct stat st;
-	unsigned char sha1[20];
+	struct object_id oid;
 
 	if (fstat(fd, &st) < 0 ||
 	    (literally
-	     ? hash_literally(sha1, fd, type, flags)
-	     : index_fd(sha1, fd, &st, type_from_string(type), path, flags)))
+	     ? hash_literally(&oid, fd, type, flags)
+	     : index_fd(&oid, fd, &st, type_from_string(type), path, flags)))
 		die((flags & HASH_WRITE_OBJECT)
 		    ? "Unable to add %s to database"
 		    : "Unable to hash %s", path);
-	printf("%s\n", sha1_to_hex(sha1));
+	printf("%s\n", oid_to_hex(&oid));
 	maybe_flush_or_die(stdout, "hash to stdout");
 }
 
diff --git a/builtin/help.c b/builtin/help.c
index 334a8494a..d3c8fc408 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -131,6 +131,7 @@ static void exec_woman_emacs(const char *path, const char *page)
 		strbuf_addf(&man_page, "(woman \"%s\")", page);
 		execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL);
 		warning_errno(_("failed to exec '%s'"), path);
+		strbuf_release(&man_page);
 	}
 }
 
@@ -152,6 +153,7 @@ static void exec_man_konqueror(const char *path, const char *page)
 		strbuf_addf(&man_page, "man:%s(1)", page);
 		execlp(path, filename, "newTab", man_page.buf, (char *)NULL);
 		warning_errno(_("failed to exec '%s'"), path);
+		strbuf_release(&man_page);
 	}
 }
 
@@ -169,6 +171,7 @@ static void exec_man_cmd(const char *cmd, const char *page)
 	strbuf_addf(&shell_cmd, "%s %s", cmd, page);
 	execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
 	warning(_("failed to exec '%s'"), cmd);
+	strbuf_release(&shell_cmd);
 }
 
 static void add_man_viewer(const char *name)
@@ -438,7 +441,7 @@ static const char *check_git_cmd(const char* cmd)
 
 	alias = alias_lookup(cmd);
 	if (alias) {
-		printf_ln(_("`git %s' is aliased to `%s'"), cmd, alias);
+		printf_ln(_("'%s' is aliased to '%s'"), cmd, alias);
 		free(alias);
 		exit(0);
 	}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 26828c1d8..8ec459f52 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -12,6 +12,7 @@
 #include "exec_cmd.h"
 #include "streaming.h"
 #include "thread-utils.h"
+#include "packfile.h"
 
 static const char index_pack_usage[] =
 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
@@ -632,7 +633,7 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
 	int first = 0, last = nr_ofs_deltas;
 
 	while (first < last) {
-		int next = (first + last) / 2;
+		int next = first + (last - first) / 2;
 		struct ofs_delta_entry *delta = &ofs_deltas[next];
 		int cmp;
 
@@ -686,7 +687,7 @@ static int find_ref_delta(const unsigned char *sha1, enum object_type type)
 	int first = 0, last = nr_ref_deltas;
 
 	while (first < last) {
-		int next = (first + last) / 2;
+		int next = first + (last - first) / 2;
 		struct ref_delta_entry *delta = &ref_deltas[next];
 		int cmp;
 
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 47823f9aa..c9b7946ba 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -579,6 +579,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 			set_git_work_tree(work_tree);
 	}
 
+	UNLEAK(real_git_dir);
+
 	flags |= INIT_DB_EXIST_OK;
 	return init_db(git_dir, real_git_dir, template_dir, flags);
 }
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 175f14797..b742539d4 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -16,34 +16,119 @@ static const char * const git_interpret_trailers_usage[] = {
 	NULL
 };
 
+static enum trailer_where where;
+static enum trailer_if_exists if_exists;
+static enum trailer_if_missing if_missing;
+
+static int option_parse_where(const struct option *opt,
+			      const char *arg, int unset)
+{
+	return trailer_set_where(&where, arg);
+}
+
+static int option_parse_if_exists(const struct option *opt,
+				  const char *arg, int unset)
+{
+	return trailer_set_if_exists(&if_exists, arg);
+}
+
+static int option_parse_if_missing(const struct option *opt,
+				   const char *arg, int unset)
+{
+	return trailer_set_if_missing(&if_missing, arg);
+}
+
+static void new_trailers_clear(struct list_head *trailers)
+{
+	struct list_head *pos, *tmp;
+	struct new_trailer_item *item;
+
+	list_for_each_safe(pos, tmp, trailers) {
+		item = list_entry(pos, struct new_trailer_item, list);
+		list_del(pos);
+		free(item);
+	}
+}
+
+static int option_parse_trailer(const struct option *opt,
+				   const char *arg, int unset)
+{
+	struct list_head *trailers = opt->value;
+	struct new_trailer_item *item;
+
+	if (unset) {
+		new_trailers_clear(trailers);
+		return 0;
+	}
+
+	if (!arg)
+		return -1;
+
+	item = xmalloc(sizeof(*item));
+	item->text = arg;
+	item->where = where;
+	item->if_exists = if_exists;
+	item->if_missing = if_missing;
+	list_add_tail(&item->list, trailers);
+	return 0;
+}
+
+static int parse_opt_parse(const struct option *opt, const char *arg,
+			   int unset)
+{
+	struct process_trailer_options *v = opt->value;
+	v->only_trailers = 1;
+	v->only_input = 1;
+	v->unfold = 1;
+	return 0;
+}
+
 int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 {
-	int in_place = 0;
-	int trim_empty = 0;
-	struct string_list trailers = STRING_LIST_INIT_NODUP;
+	struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+	LIST_HEAD(trailers);
 
 	struct option options[] = {
-		OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
-		OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
-		OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
-				N_("trailer(s) to add")),
+		OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
+		OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
+
+		OPT_CALLBACK(0, "where", NULL, N_("action"),
+			     N_("where to place the new trailer"), option_parse_where),
+		OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
+			     N_("action if trailer already exists"), option_parse_if_exists),
+		OPT_CALLBACK(0, "if-missing", NULL, N_("action"),
+			     N_("action if trailer is missing"), option_parse_if_missing),
+
+		OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")),
+		OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")),
+		OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")),
+		{ OPTION_CALLBACK, 0, "parse", &opts, NULL, N_("set parsing options"),
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse },
+		OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"),
+				N_("trailer(s) to add"), option_parse_trailer),
 		OPT_END()
 	};
 
 	argc = parse_options(argc, argv, prefix, options,
 			     git_interpret_trailers_usage, 0);
 
+	if (opts.only_input && !list_empty(&trailers))
+		usage_msg_opt(
+			_("--trailer with --only-input does not make sense"),
+			git_interpret_trailers_usage,
+			options);
+
 	if (argc) {
 		int i;
 		for (i = 0; i < argc; i++)
-			process_trailers(argv[i], in_place, trim_empty, &trailers);
+			process_trailers(argv[i], &opts, &trailers);
 	} else {
-		if (in_place)
+		if (opts.in_place)
 			die(_("no input file given for in-place editing"));
-		process_trailers(NULL, in_place, trim_empty, &trailers);
+		process_trailers(NULL, &opts, &trailers);
 	}
 
-	string_list_clear(&trailers, 0);
+	new_trailers_clear(&trailers);
 
 	return 0;
 }
diff --git a/builtin/log.c b/builtin/log.c
index 5ffc380bd..d81a09051 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -27,6 +27,7 @@
 #include "version.h"
 #include "mailmap.h"
 #include "gpg-interface.h"
+#include "progress.h"
 
 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
@@ -58,9 +59,9 @@ static int auto_decoration_style(void)
 	return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
 }
 
-static int parse_decoration_style(const char *var, const char *value)
+static int parse_decoration_style(const char *value)
 {
-	switch (git_config_maybe_bool(var, value)) {
+	switch (git_parse_maybe_bool(value)) {
 	case 1:
 		return DECORATE_SHORT_REFS;
 	case 0:
@@ -82,7 +83,7 @@ static int decorate_callback(const struct option *opt, const char *arg, int unse
 	if (unset)
 		decoration_style = 0;
 	else if (arg)
-		decoration_style = parse_decoration_style("command line", arg);
+		decoration_style = parse_decoration_style(arg);
 	else
 		decoration_style = DECORATE_SHORT_REFS;
 
@@ -412,7 +413,7 @@ static int git_log_config(const char *var, const char *value, void *cb)
 	if (!strcmp(var, "log.date"))
 		return git_config_string(&default_date_mode, var, value);
 	if (!strcmp(var, "log.decorate")) {
-		decoration_style = parse_decoration_style(var, value);
+		decoration_style = parse_decoration_style(value);
 		if (decoration_style < 0)
 			decoration_style = 0; /* maybe warn? */
 		return 0;
@@ -487,8 +488,8 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
 	    !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
 		return stream_blob_to_fd(1, oid, NULL, 0);
 
-	if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
-				  oidc.hash, &obj_context))
+	if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
+				 &oidc, &obj_context))
 		die(_("Not a valid object name %s"), obj_name);
 	if (!obj_context.path ||
 	    !textconv_object(obj_context.path, obj_context.mode, &oidc, 1, &buf, &size)) {
@@ -824,7 +825,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 	if (!strcmp(var, "format.from")) {
-		int b = git_config_maybe_bool(var, value);
+		int b = git_parse_maybe_bool(value);
 		free(from);
 		if (b < 0)
 			from = xstrdup(value);
@@ -1422,6 +1423,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	char *branch_name = NULL;
 	char *base_commit = NULL;
 	struct base_tree_info bases;
+	int show_progress = 0;
+	struct progress *progress = NULL;
 
 	const struct option builtin_format_patch_options[] = {
 		{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
@@ -1493,6 +1496,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		OPT_FILENAME(0, "signature-file", &signature_file,
 				N_("add a signature from a file")),
 		OPT__QUIET(&quiet, N_("don't print the patch filenames")),
+		OPT_BOOL(0, "progress", &show_progress,
+			 N_("show progress while generating patches")),
 		OPT_END()
 	};
 
@@ -1655,10 +1660,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			check_head = 1;
 
 		if (check_head) {
-			struct object_id oid;
 			const char *ref, *v;
 			ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
-						 oid.hash, NULL);
+						 NULL, NULL);
 			if (ref && skip_prefix(ref, "refs/heads/", &v))
 				branch_name = xstrdup(v);
 			else
@@ -1752,8 +1756,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		start_number--;
 	}
 	rev.add_signoff = do_signoff;
+
+	if (show_progress)
+		progress = start_delayed_progress(_("Generating patches"), total);
 	while (0 <= --nr) {
 		int shown;
+		display_progress(progress, total - nr);
 		commit = list[nr];
 		rev.nr = total - nr + (start_number - 1);
 		/* Make the second and subsequent mails replies to the first */
@@ -1818,6 +1826,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		if (!use_stdout)
 			fclose(rev.diffopt.file);
 	}
+	stop_progress(&progress);
 	free(list);
 	free(branch_name);
 	string_list_clear(&extra_to, 0);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index c6126eae5..8c713c47a 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -19,6 +19,7 @@
 #include "pathspec.h"
 #include "run-command.h"
 #include "submodule.h"
+#include "submodule-config.h"
 
 static int abbrev;
 static int show_deleted;
@@ -210,8 +211,6 @@ static void show_submodule(struct repository *superproject,
 	if (repo_read_index(&submodule) < 0)
 		die("index file corrupt");
 
-	repo_read_gitmodules(&submodule);
-
 	show_files(&submodule, dir);
 
 	repo_clear(&submodule);
@@ -609,9 +608,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	if (require_work_tree && !is_inside_work_tree())
 		setup_work_tree();
 
-	if (recurse_submodules)
-		repo_read_gitmodules(the_repository);
-
 	if (recurse_submodules &&
 	    (show_stage || show_deleted || show_others || show_unmerged ||
 	     show_killed || show_modified || show_resolve_undo || with_tree))
@@ -677,5 +673,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 		return bad ? 1 : 0;
 	}
 
+	UNLEAK(dir);
 	return 0;
 }
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index bad6735c7..d01ddecf6 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -213,11 +213,11 @@ static void unresolved_directory(const struct traverse_info *info,
 
 	newbase = traverse_path(info, p);
 
-#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid->hash : NULL)
-	buf0 = fill_tree_descriptor(t+0, ENTRY_SHA1(n + 0));
-	buf1 = fill_tree_descriptor(t+1, ENTRY_SHA1(n + 1));
-	buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
-#undef ENTRY_SHA1
+#define ENTRY_OID(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid : NULL)
+	buf0 = fill_tree_descriptor(t + 0, ENTRY_OID(n + 0));
+	buf1 = fill_tree_descriptor(t + 1, ENTRY_OID(n + 1));
+	buf2 = fill_tree_descriptor(t + 2, ENTRY_OID(n + 2));
+#undef ENTRY_OID
 
 	merge_trees(t, newbase);
 
@@ -347,12 +347,12 @@ static void merge_trees(struct tree_desc t[3], const char *base)
 
 static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	void *buf;
 
-	if (get_sha1(rev, sha1))
+	if (get_oid(rev, &oid))
 		die("unknown rev %s", rev);
-	buf = fill_tree_descriptor(desc, sha1);
+	buf = fill_tree_descriptor(desc, &oid);
 	if (!buf)
 		die("%s is not a tree", rev);
 	return buf;
diff --git a/builtin/merge.c b/builtin/merge.c
index 23c53a308..ab5ffe85e 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -32,6 +32,7 @@
 #include "gpg-interface.h"
 #include "sequencer.h"
 #include "string-list.h"
+#include "packfile.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)
@@ -70,7 +71,9 @@ static int continue_current_merge;
 static int allow_unrelated_histories;
 static int show_progress = -1;
 static int default_to_upstream = 1;
+static int signoff;
 static const char *sign_commit;
+static int verify_msg = 1;
 
 static struct strategy all_strategy[] = {
 	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -233,6 +236,8 @@ static struct option builtin_merge_options[] = {
 	{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 	  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 	OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
+	OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+	OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
 	OPT_END()
 };
 
@@ -250,6 +255,7 @@ static int save_state(struct object_id *stash)
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf buffer = STRBUF_INIT;
 	const char *argv[] = {"stash", "create", NULL};
+	int rc = -1;
 
 	cp.argv = argv;
 	cp.out = -1;
@@ -263,11 +269,14 @@ static int save_state(struct object_id *stash)
 	if (finish_command(&cp) || len < 0)
 		die(_("stash failed"));
 	else if (!len)		/* no changes */
-		return -1;
+		goto out;
 	strbuf_setlen(&buffer, buffer.len-1);
 	if (get_oid(buffer.buf, stash))
 		die(_("not a valid object: %s"), buffer.buf);
-	return 0;
+	rc = 0;
+out:
+	strbuf_release(&buffer);
+	return rc;
 }
 
 static void read_empty(unsigned const char *sha1, int verbose)
@@ -566,7 +575,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 	else if (!strcmp(k, "merge.renormalize"))
 		option_renormalize = git_config_bool(k, v);
 	else if (!strcmp(k, "merge.ff")) {
-		int boolval = git_config_maybe_bool(k, v);
+		int boolval = git_parse_maybe_bool(v);
 		if (0 <= boolval) {
 			fast_forward = boolval ? FF_ALLOW : FF_NO;
 		} else if (v && !strcmp(v, "only")) {
@@ -766,6 +775,8 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 		BUG("the control must not reach here under --squash");
 	if (0 < option_edit)
 		strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
+	if (signoff)
+		append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
 	write_merge_heads(remoteheads);
 	write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
 	if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
@@ -775,6 +786,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 		if (launch_editor(git_path_merge_msg(), NULL, NULL))
 			abort_commit(remoteheads, NULL);
 	}
+
+	if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+					  "commit-msg",
+					  git_path_merge_msg(), NULL))
+		abort_commit(remoteheads, NULL);
+
 	read_merge_msg(&msg);
 	strbuf_stripspace(&msg, 0 < option_edit);
 	if (!msg.len)
@@ -929,6 +946,7 @@ static void write_merge_heads(struct commit_list *remoteheads)
 	if (fast_forward == FF_NO)
 		strbuf_addstr(&buf, "no-ff");
 	write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
+	strbuf_release(&buf);
 }
 
 static void write_merge_state(struct commit_list *remoteheads)
@@ -949,7 +967,7 @@ static int default_edit_option(void)
 		return 0;
 
 	if (e) {
-		int v = git_config_maybe_bool(name, e);
+		int v = git_parse_maybe_bool(e);
 		if (v < 0)
 			die(_("Bad value '%s' in environment '%s'"), e, name);
 		return v;
@@ -1354,7 +1372,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		 * 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."));
+		finish_up_to_date(_("Already up to date."));
 		goto done;
 	} else if (fast_forward != FF_NO && !remoteheads->next &&
 			!common->next &&
@@ -1437,7 +1455,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			}
 		}
 		if (up_to_date) {
-			finish_up_to_date(_("Already up-to-date. Yeeah!"));
+			finish_up_to_date(_("Already up to date. Yeeah!"));
 			goto done;
 		}
 	}
diff --git a/builtin/mv.c b/builtin/mv.c
index dcf6736b5..ffdd5f01a 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -81,7 +81,7 @@ static void prepare_move_submodule(const char *src, int first,
 	struct strbuf submodule_dotgit = STRBUF_INIT;
 	if (!S_ISGITLINK(active_cache[first]->ce_mode))
 		die(_("Directory %s is in index and no submodule?"), src);
-	if (!is_staging_gitmodules_ok())
+	if (!is_staging_gitmodules_ok(&the_index))
 		die(_("Please stage your changes to .gitmodules or stash them to proceed"));
 	strbuf_addf(&submodule_dotgit, "%s/.git", src);
 	*submodule_gitfile = read_gitfile(submodule_dotgit.buf);
@@ -131,7 +131,6 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	struct stat st;
 	struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
 
-	gitmodules_config();
 	git_config(git_default_config, NULL);
 
 	argc = parse_options(argc, argv, prefix, builtin_mv_options,
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 598da6c8b..9e088ebd1 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -494,5 +494,6 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 				  always, allow_undefined, data.name_only);
 	}
 
+	UNLEAK(revs);
 	return 0;
 }
diff --git a/builtin/notes.c b/builtin/notes.c
index 77573cf1e..8e54f2d14 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -328,6 +328,7 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
 	} else {
 		finish_copy_notes_for_rewrite(c, msg);
 	}
+	strbuf_release(&buf);
 	return ret;
 }
 
@@ -456,7 +457,7 @@ static int add(int argc, const char **argv, const char *prefix)
 			oid_to_hex(&object));
 	}
 
-	prepare_note_data(&object, &d, note->hash);
+	prepare_note_data(&object, &d, note ? note->hash : NULL);
 	if (d.buf.len || allow_empty) {
 		write_note_data(&d, new_note.hash);
 		if (add_note(t, &object, &new_note, combine_notes_overwrite))
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c753e9237..6e77dfd44 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -25,6 +25,7 @@
 #include "sha1-array.h"
 #include "argv-array.h"
 #include "mru.h"
+#include "packfile.h"
 
 static const char *pack_usage[] = {
 	N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
@@ -1011,7 +1012,7 @@ static int want_object_in_pack(const unsigned char *sha1,
 			return want;
 	}
 
-	for (entry = packed_git_mru->head; entry; entry = entry->next) {
+	for (entry = packed_git_mru.head; entry; entry = entry->next) {
 		struct packed_git *p = entry->item;
 		off_t offset;
 
@@ -1029,7 +1030,7 @@ static int want_object_in_pack(const unsigned char *sha1,
 			}
 			want = want_found_object(exclude, p);
 			if (!exclude && want > 0)
-				mru_mark(packed_git_mru, entry);
+				mru_mark(&packed_git_mru, entry);
 			if (want != -1)
 				return want;
 		}
@@ -1276,7 +1277,7 @@ static int done_pbase_path_pos(unsigned hash)
 	int lo = 0;
 	int hi = done_pbase_paths_num;
 	while (lo < hi) {
-		int mi = (hi + lo) / 2;
+		int mi = lo + (hi - lo) / 2;
 		if (done_pbase_paths[mi] == hash)
 			return mi;
 		if (done_pbase_paths[mi] < hash)
@@ -2170,7 +2171,10 @@ static void *threaded_find_deltas(void *arg)
 {
 	struct thread_params *me = arg;
 
+	progress_lock();
 	while (me->remaining) {
+		progress_unlock();
+
 		find_deltas(me->list, &me->remaining,
 			    me->window, me->depth, me->processed);
 
@@ -2192,7 +2196,10 @@ static void *threaded_find_deltas(void *arg)
 			pthread_cond_wait(&me->cond, &me->mutex);
 		me->data_ready = 0;
 		pthread_mutex_unlock(&me->mutex);
+
+		progress_lock();
 	}
+	progress_unlock();
 	/* leave ->working 1 so that this doesn't get more work assigned */
 	return NULL;
 }
@@ -2556,8 +2563,8 @@ struct in_pack_object {
 };
 
 struct in_pack {
-	int alloc;
-	int nr;
+	unsigned int alloc;
+	unsigned int nr;
 	struct in_pack_object *array;
 };
 
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index cb1df1c76..aaa813632 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -7,6 +7,7 @@
 */
 
 #include "builtin.h"
+#include "packfile.h"
 
 #define BLKSIZE 512
 
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index ac978ad40..419238171 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "progress.h"
 #include "parse-options.h"
+#include "packfile.h"
 
 static const char * const prune_packed_usage[] = {
 	N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
@@ -37,8 +38,7 @@ static int prune_object(const struct object_id *oid, const char *path,
 void prune_packed_objects(int opts)
 {
 	if (opts & PRUNE_PACKED_VERBOSE)
-		progress = start_progress_delay(_("Removing duplicate objects"),
-			256, 95, 2);
+		progress = start_delayed_progress(_("Removing duplicate objects"), 256);
 
 	for_each_loose_file_in_objdir(get_object_directory(),
 				      prune_object, NULL, prune_subdir, &opts);
diff --git a/builtin/prune.c b/builtin/prune.c
index c37869054..cddabf26a 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -138,7 +138,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	if (show_progress == -1)
 		show_progress = isatty(2);
 	if (show_progress)
-		progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2);
+		progress = start_delayed_progress(_("Checking connectivity"), 0);
 
 	mark_reachable_objects(&revs, 1, expire, progress);
 	stop_progress(&progress);
diff --git a/builtin/pull.c b/builtin/pull.c
index 9b86e519b..6f772e8a2 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -39,7 +39,7 @@ enum rebase_type {
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
 		int fatal)
 {
-	int v = git_config_maybe_bool("pull.rebase", value);
+	int v = git_parse_maybe_bool(value);
 
 	if (!v)
 		return REBASE_FALSE;
@@ -274,7 +274,7 @@ static const char *config_get_ff(void)
 	if (git_config_get_value("pull.ff", &value))
 		return NULL;
 
-	switch (git_config_maybe_bool("pull.ff", value)) {
+	switch (git_parse_maybe_bool(value)) {
 	case 0:
 		return "--no-ff";
 	case 1:
@@ -325,6 +325,10 @@ static int git_pull_config(const char *var, const char *value, void *cb)
 	if (!strcmp(var, "rebase.autostash")) {
 		config_autostash = git_config_bool(var, value);
 		return 0;
+	} else if (!strcmp(var, "submodule.recurse")) {
+		recurse_submodules = git_config_bool(var, value) ?
+			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
+		return 0;
 	}
 	return git_default_config(var, value, cb);
 }
@@ -815,6 +819,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	if (!getenv("GIT_REFLOG_ACTION"))
 		set_reflog_message(argc, argv);
 
+	git_config(git_pull_config, NULL);
+
 	argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
 
 	parse_repo_refspecs(argc, argv, &repo, &refspecs);
@@ -825,8 +831,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	if (opt_rebase < 0)
 		opt_rebase = config_get_rebase();
 
-	git_config(git_pull_config, NULL);
-
 	if (read_cache_unmerged())
 		die_resolve_conflict("pull");
 
diff --git a/builtin/push.c b/builtin/push.c
index 03846e837..2ac810422 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -481,7 +481,7 @@ static int git_push_config(const char *k, const char *v, void *cb)
 	} else if (!strcmp(k, "push.gpgsign")) {
 		const char *value;
 		if (!git_config_get_value("push.gpgsign", &value)) {
-			switch (git_config_maybe_bool("push.gpgsign", value)) {
+			switch (git_parse_maybe_bool(value)) {
 			case 0:
 				set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
 				break;
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index d5f618d08..bf87a2710 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -164,8 +164,6 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	argc = parse_options(argc, argv, unused_prefix, read_tree_options,
 			     read_tree_usage, 0);
 
-	load_submodule_cache();
-
 	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 
 	prefix_set = opts.prefix ? 1 : 0;
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index c82b4dce6..f8519363a 100644
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -12,15 +12,30 @@ static const char * const builtin_rebase_helper_usage[] = {
 int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
 {
 	struct replay_opts opts = REPLAY_OPTS_INIT;
+	int keep_empty = 0;
 	enum {
-		CONTINUE = 1, ABORT
+		CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_SHA1S, EXPAND_SHA1S,
+		CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH
 	} command = 0;
 	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_CMDMODE(0, "continue", &command, N_("continue rebase"),
 				CONTINUE),
 		OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
 				ABORT),
+		OPT_CMDMODE(0, "make-script", &command,
+			N_("make rebase script"), MAKE_SCRIPT),
+		OPT_CMDMODE(0, "shorten-ids", &command,
+			N_("shorten SHA-1s in the todo list"), SHORTEN_SHA1S),
+		OPT_CMDMODE(0, "expand-ids", &command,
+			N_("expand SHA-1s in the todo list"), EXPAND_SHA1S),
+		OPT_CMDMODE(0, "check-todo-list", &command,
+			N_("check the todo list"), CHECK_TODO_LIST),
+		OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
+			N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
+		OPT_CMDMODE(0, "rearrange-squash", &command,
+			N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
 		OPT_END()
 	};
 
@@ -37,5 +52,17 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
 		return !!sequencer_continue(&opts);
 	if (command == ABORT && argc == 1)
 		return !!sequencer_remove_state(&opts);
+	if (command == MAKE_SCRIPT && argc > 1)
+		return !!sequencer_make_script(keep_empty, stdout, argc, argv);
+	if (command == SHORTEN_SHA1S && argc == 1)
+		return !!transform_todo_ids(1);
+	if (command == EXPAND_SHA1S && argc == 1)
+		return !!transform_todo_ids(0);
+	if (command == CHECK_TODO_LIST && argc == 1)
+		return !!check_todo_list();
+	if (command == SKIP_UNNECESSARY_PICKS && argc == 1)
+		return !!skip_unnecessary_picks();
+	if (command == REARRANGE_SQUASH && argc == 1)
+		return !!rearrange_squash();
 	usage_with_options(builtin_rebase_helper_usage, options);
 }
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index cabdc55e0..cc4876740 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -23,6 +23,7 @@
 #include "fsck.h"
 #include "tmp-objdir.h"
 #include "oidset.h"
+#include "packfile.h"
 
 static const char * const receive_pack_usage[] = {
 	N_("git receive-pack <git-dir>"),
@@ -742,7 +743,7 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
 		size_t n;
 		if (feed(feed_state, &buf, &n))
 			break;
-		if (write_in_full(proc.in, buf, n) != n)
+		if (write_in_full(proc.in, buf, n) < 0)
 			break;
 	}
 	close(proc.in);
@@ -919,9 +920,9 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
  */
 static int head_has_history(void)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 
-	return !get_sha1("HEAD", sha1);
+	return !get_oid("HEAD", &oid);
 }
 
 static const char *push_to_deploy(unsigned char *sha1,
@@ -1138,7 +1139,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 		}
 		if (ref_transaction_delete(transaction,
 					   namespaced_name,
-					   old_oid->hash,
+					   old_oid ? old_oid->hash : NULL,
 					   0, "push", &err)) {
 			rp_error("%s", err.buf);
 			strbuf_release(&err);
@@ -1206,11 +1207,10 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)
 	const char *dst_name;
 	struct string_list_item *item;
 	struct command *dst_cmd;
-	unsigned char sha1[GIT_MAX_RAWSZ];
 	int flag;
 
 	strbuf_addf(&buf, "%s%s", get_git_namespace(), cmd->ref_name);
-	dst_name = resolve_ref_unsafe(buf.buf, 0, sha1, &flag);
+	dst_name = resolve_ref_unsafe(buf.buf, 0, NULL, &flag);
 	strbuf_release(&buf);
 
 	if (!(flag & REF_ISSYMREF))
@@ -1458,7 +1458,6 @@ static void execute_commands(struct command *commands,
 {
 	struct check_connected_options opt = CHECK_CONNECTED_INIT;
 	struct command *cmd;
-	struct object_id oid;
 	struct iterate_data data;
 	struct async muxer;
 	int err_fd = 0;
@@ -1515,7 +1514,7 @@ static void execute_commands(struct command *commands,
 	check_aliased_updates(commands);
 
 	free(head_name_to_free);
-	head_name = head_name_to_free = resolve_refdup("HEAD", 0, oid.hash, NULL);
+	head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL);
 
 	if (use_atomic)
 		execute_commands_atomic(commands, si);
diff --git a/builtin/reflog.c b/builtin/reflog.c
index e237d927a..2067cca5b 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -126,7 +126,7 @@ static int commit_is_complete(struct commit *commit)
 		struct commit *c;
 		struct commit_list *parent;
 
-		c = (struct commit *)study.objects[--study.nr].item;
+		c = (struct commit *)object_array_pop(&study);
 		if (!c->object.parsed && !parse_object(&c->object.oid))
 			c->object.flags |= INCOMPLETE;
 
@@ -182,8 +182,8 @@ static int commit_is_complete(struct commit *commit)
 			found.objects[i].item->flags |= SEEN;
 	}
 	/* free object arrays */
-	free(study.objects);
-	free(found.objects);
+	object_array_clear(&study);
+	object_array_clear(&found);
 	return !is_incomplete;
 }
 
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index bfb21ba7d..6a9127a33 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -57,7 +57,7 @@ static char *strip_escapes(const char *str, const char *service,
 				special = str[rpos];
 				if (rpos == 1)
 					break;
-				/* Fall-through to error. */
+				/* fallthrough */
 			default:
 				die("Bad remote-ext placeholder '%%%c'.",
 					str[rpos]);
diff --git a/builtin/remote.c b/builtin/remote.c
index 6273c0c23..4f5cac96b 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -301,7 +301,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 			}
 			string_list_append(&info->merge, xstrdup(value));
 		} else {
-			int v = git_config_maybe_bool(orig_key, value);
+			int v = git_parse_maybe_bool(value);
 			if (v >= 0)
 				info->rebase = v;
 			else if (!strcmp(value, "preserve"))
@@ -558,19 +558,19 @@ static int read_remote_branches(const char *refname,
 	struct strbuf buf = STRBUF_INIT;
 	struct string_list_item *item;
 	int flag;
-	struct object_id orig_oid;
 	const char *symref;
 
 	strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
 	if (starts_with(refname, buf.buf)) {
 		item = string_list_append(rename->remote_branches, xstrdup(refname));
 		symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
-					    orig_oid.hash, &flag);
+					    NULL, &flag);
 		if (flag & REF_ISSYMREF)
 			item->util = xstrdup(symref);
 		else
 			item->util = NULL;
 	}
+	strbuf_release(&buf);
 
 	return 0;
 }
@@ -595,6 +595,7 @@ static int migrate_file(struct remote *remote)
 		unlink_or_warn(git_path("remotes/%s", remote->name));
 	else if (remote->origin == REMOTE_BRANCHES)
 		unlink_or_warn(git_path("branches/%s", remote->name));
+	strbuf_release(&buf);
 
 	return 0;
 }
@@ -1563,9 +1564,7 @@ static int set_url(int argc, const char **argv)
 						       "^$", 0);
 		else
 			git_config_set(name_buf.buf, newurl);
-		strbuf_release(&name_buf);
-
-		return 0;
+		goto out;
 	}
 
 	/* Old URL specified. Demand that one matches. */
@@ -1588,6 +1587,8 @@ static int set_url(int argc, const char **argv)
 		git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
 	else
 		git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
+out:
+	strbuf_release(&name_buf);
 	return 0;
 }
 
diff --git a/builtin/replace.c b/builtin/replace.c
index fba336a68..3e71a7715 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -50,7 +50,7 @@ static int show_reference(const char *refname, const struct object_id *oid,
 			struct object_id object;
 			enum object_type obj_type, repl_type;
 
-			if (get_sha1(refname, object.hash))
+			if (get_oid(refname, &object))
 				return error("Failed to resolve '%s' as a valid ref.", refname);
 
 			obj_type = sha1_object_info(object.hash, NULL);
@@ -269,7 +269,7 @@ static void import_object(struct object_id *oid, enum object_type type,
 
 		if (fstat(fd, &st) < 0)
 			die_errno("unable to fstat %s", filename);
-		if (index_fd(oid->hash, fd, &st, type, NULL, flags) < 0)
+		if (index_fd(oid, fd, &st, type, NULL, flags) < 0)
 			die("unable to write object to database");
 		/* index_fd close()s fd for us */
 	}
@@ -365,7 +365,7 @@ static void check_one_mergetag(struct commit *commit,
 	/* iterate over new parents */
 	for (i = 1; i < mergetag_data->argc; i++) {
 		struct object_id oid;
-		if (get_sha1(mergetag_data->argv[i], oid.hash) < 0)
+		if (get_oid(mergetag_data->argv[i], &oid) < 0)
 			die(_("Not a valid object name: '%s'"), mergetag_data->argv[i]);
 		if (!oidcmp(&tag->tagged->oid, &oid))
 			return; /* found */
diff --git a/builtin/rerere.c b/builtin/rerere.c
index ffb66e290..0bc40298c 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -18,7 +18,7 @@ static int outf(void *dummy, mmbuffer_t *ptr, int nbuf)
 {
 	int i;
 	for (i = 0; i < nbuf; i++)
-		if (write_in_full(1, ptr[i].ptr, ptr[i].size) != ptr[i].size)
+		if (write_in_full(1, ptr[i].ptr, ptr[i].size) < 0)
 			return -1;
 	return 0;
 }
diff --git a/builtin/reset.c b/builtin/reset.c
index 7aeaea273..9cd89b230 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -44,10 +44,11 @@ static inline int is_merge(void)
 
 static int reset_index(const struct object_id *oid, int reset_type, int quiet)
 {
-	int nr = 1;
+	int i, nr = 0;
 	struct tree_desc desc[2];
 	struct tree *tree;
 	struct unpack_trees_options opts;
+	int ret = -1;
 
 	memset(&opts, 0, sizeof(opts));
 	opts.head_idx = 1;
@@ -75,23 +76,32 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
 		struct object_id head_oid;
 		if (get_oid("HEAD", &head_oid))
 			return error(_("You do not have a valid HEAD."));
-		if (!fill_tree_descriptor(desc, head_oid.hash))
+		if (!fill_tree_descriptor(desc + nr, &head_oid))
 			return error(_("Failed to find tree of HEAD."));
 		nr++;
 		opts.fn = twoway_merge;
 	}
 
-	if (!fill_tree_descriptor(desc + nr - 1, oid->hash))
-		return error(_("Failed to find tree of %s."), oid_to_hex(oid));
+	if (!fill_tree_descriptor(desc + nr, oid)) {
+		error(_("Failed to find tree of %s."), oid_to_hex(oid));
+		goto out;
+	}
+	nr++;
+
 	if (unpack_trees(nr, desc, &opts))
-		return -1;
+		goto out;
 
 	if (reset_type == MIXED || reset_type == HARD) {
 		tree = parse_tree_indirect(oid);
 		prime_cache_tree(&the_index, tree);
 	}
 
-	return 0;
+	ret = 0;
+
+out:
+	for (i = 0; i < nr; i++)
+		free((void *)desc[i].buffer);
+	return ret;
 }
 
 static void print_new_head_line(struct commit *commit)
@@ -156,6 +166,7 @@ static int read_from_tree(const struct pathspec *pathspec,
 	opt.output_format = DIFF_FORMAT_CALLBACK;
 	opt.format_callback = update_index_from_diff;
 	opt.format_callback_data = &intent_to_add;
+	opt.flags |= DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
 
 	if (do_diff_cache(tree_oid, &opt))
 		return 1;
@@ -219,8 +230,8 @@ static void parse_args(struct pathspec *pathspec,
 		 * has to be unambiguous. If there is a single argument, it
 		 * can not be a tree
 		 */
-		else if ((!argv[1] && !get_sha1_committish(argv[0], unused.hash)) ||
-			 (argv[1] && !get_sha1_treeish(argv[0], unused.hash))) {
+		else if ((!argv[1] && !get_oid_committish(argv[0], &unused)) ||
+			 (argv[1] && !get_oid_treeish(argv[0], &unused))) {
 			/*
 			 * Ok, argv[0] looks like a commit/tree; it should not
 			 * be a filename.
@@ -308,15 +319,13 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 						PARSE_OPT_KEEP_DASHDASH);
 	parse_args(&pathspec, argv, prefix, patch_mode, &rev);
 
-	load_submodule_cache();
-
-	unborn = !strcmp(rev, "HEAD") && get_sha1("HEAD", oid.hash);
+	unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
 	if (unborn) {
 		/* reset on unborn branch: treat as reset to empty tree */
 		hashcpy(oid.hash, EMPTY_TREE_SHA1_BIN);
 	} else if (!pathspec.nr) {
 		struct commit *commit;
-		if (get_sha1_committish(rev, oid.hash))
+		if (get_oid_committish(rev, &oid))
 			die(_("Failed to resolve '%s' as a valid revision."), rev);
 		commit = lookup_commit_reference(&oid);
 		if (!commit)
@@ -324,7 +333,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 		oidcpy(&oid, &commit->object.oid);
 	} else {
 		struct tree *tree;
-		if (get_sha1_treeish(rev, oid.hash))
+		if (get_oid_treeish(rev, &oid))
 			die(_("Failed to resolve '%s' as a valid tree."), rev);
 		tree = parse_tree_indirect(&oid);
 		if (!tree)
@@ -368,8 +377,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 		die_if_unmerged_cache(reset_type);
 
 	if (reset_type != SOFT) {
-		struct lock_file *lock = xcalloc(1, sizeof(*lock));
-		hold_locked_index(lock, LOCK_DIE_ON_ERROR);
+		struct lock_file lock = LOCK_INIT;
+		hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
 		if (reset_type == MIXED) {
 			int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
 			if (read_from_tree(&pathspec, &oid, intent_to_add))
@@ -385,7 +394,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 				die(_("Could not reset index file to revision '%s'."), rev);
 		}
 
-		if (write_locked_index(&the_index, lock, COMMIT_LOCK))
+		if (write_locked_index(&the_index, &lock, COMMIT_LOCK))
 			die(_("Could not write new index file."));
 	}
 
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 95b412825..c1c74d4a7 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -367,7 +367,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 		revs.limited = 1;
 
 	if (show_progress)
-		progress = start_progress_delay(show_progress, 0, 0, 2);
+		progress = start_delayed_progress(show_progress, 0);
 
 	if (use_bitmap_index && !revs.prune) {
 		if (revs.count && !revs.left_right && !revs.cherry_mark) {
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 7f965fe74..a8d7e6f7a 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -274,7 +274,7 @@ static int try_difference(const char *arg)
 		return 0;
 	}
 
-	if (!get_sha1_committish(this, oid.hash) && !get_sha1_committish(next, end.hash)) {
+	if (!get_oid_committish(this, &oid) && !get_oid_committish(next, &end)) {
 		show_rev(NORMAL, &end, next);
 		show_rev(symmetric ? NORMAL : REVERSED, &oid, this);
 		if (symmetric) {
@@ -328,7 +328,7 @@ static int try_parent_shorthands(const char *arg)
 		return 0;
 
 	*dotdot = 0;
-	if (get_sha1_committish(arg, oid.hash)) {
+	if (get_oid_committish(arg, &oid)) {
 		*dotdot = '^';
 		return 0;
 	}
@@ -387,6 +387,14 @@ static const char *skipspaces(const char *s)
 	return s;
 }
 
+static char *findspace(const char *s)
+{
+	for (; *s; s++)
+		if (isspace(*s))
+			return (char*)s;
+	return NULL;
+}
+
 static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 {
 	static int keep_dashdash = 0, stop_at_non_option = 0;
@@ -434,7 +442,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 	/* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
 	while (strbuf_getline(&sb, stdin) != EOF) {
 		const char *s;
-		const char *help;
+		char *help;
 		struct option *o;
 
 		if (!sb.len)
@@ -444,15 +452,17 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 		memset(opts + onb, 0, sizeof(opts[onb]));
 
 		o = &opts[onb++];
-		help = strchr(sb.buf, ' ');
-		if (!help || *sb.buf == ' ') {
+		help = findspace(sb.buf);
+		if (!help || sb.buf == help) {
 			o->type = OPTION_GROUP;
 			o->help = xstrdup(skipspaces(sb.buf));
 			continue;
 		}
 
+		*help = '\0';
+
 		o->type = OPTION_CALLBACK;
-		o->help = xstrdup(skipspaces(help));
+		o->help = xstrdup(skipspaces(help+1));
 		o->value = &parsed;
 		o->flags = PARSE_OPT_NOARG;
 		o->callback = &parseopt_dump;
@@ -702,7 +712,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			}
 			if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
 				quiet = 1;
-				flags |= GET_SHA1_QUIETLY;
+				flags |= GET_OID_QUIETLY;
 				continue;
 			}
 			if (opt_with_value(arg, "--short", &arg)) {
@@ -868,6 +878,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 						: "false");
 				continue;
 			}
+			if (!strcmp(arg, "--is-shallow-repository")) {
+				printf("%s\n", is_repository_shallow() ? "true"
+						: "false");
+				continue;
+			}
 			if (!strcmp(arg, "--shared-index-path")) {
 				if (read_cache() < 0)
 					die(_("Could not read the index"));
@@ -911,7 +926,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			name++;
 			type = REVERSED;
 		}
-		if (!get_sha1_with_context(name, flags, oid.hash, &unused)) {
+		if (!get_oid_with_context(name, flags, &oid, &unused)) {
 			if (verify)
 				revs_count++;
 			else
diff --git a/builtin/rm.c b/builtin/rm.c
index 52826d137..d91451fea 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -255,7 +255,6 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	struct pathspec pathspec;
 	char *seen;
 
-	gitmodules_config();
 	git_config(git_default_config, NULL);
 
 	argc = parse_options(argc, argv, prefix, builtin_rm_options,
@@ -286,7 +285,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 		list.entry[list.nr].name = xstrdup(ce->name);
 		list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
 		if (list.entry[list.nr++].is_submodule &&
-		    !is_staging_gitmodules_ok())
+		    !is_staging_gitmodules_ok(&the_index))
 			die (_("Please stage your changes to .gitmodules or stash them to proceed"));
 	}
 
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 633e0c3cd..fc4f0bb5f 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -105,7 +105,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
 	if (!strcmp(k, "push.gpgsign")) {
 		const char *value;
 		if (!git_config_get_value("push.gpgsign", &value)) {
-			switch (git_config_maybe_bool("push.gpgsign", value)) {
+			switch (git_parse_maybe_bool(value)) {
 			case 0:
 				args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
 				break;
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 43c4799ea..e29875b84 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -52,26 +52,8 @@ static void insert_one_record(struct shortlog *log,
 			      const char *oneline)
 {
 	struct string_list_item *item;
-	const char *mailbuf, *namebuf;
-	size_t namelen, maillen;
-	struct strbuf namemailbuf = STRBUF_INIT;
-	struct ident_split ident;
 
-	if (split_ident_line(&ident, author, strlen(author)))
-		return;
-
-	namebuf = ident.name_begin;
-	mailbuf = ident.mail_begin;
-	namelen = ident.name_end - ident.name_begin;
-	maillen = ident.mail_end - ident.mail_begin;
-
-	map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
-	strbuf_add(&namemailbuf, namebuf, namelen);
-
-	if (log->email)
-		strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf);
-
-	item = string_list_insert(&log->list, namemailbuf.buf);
+	item = string_list_insert(&log->list, author);
 
 	if (log->summary)
 		item->util = (void *)(UTIL_TO_INT(item) + 1);
@@ -114,9 +96,33 @@ static void insert_one_record(struct shortlog *log,
 	}
 }
 
+static int parse_stdin_author(struct shortlog *log,
+			       struct strbuf *out, const char *in)
+{
+	const char *mailbuf, *namebuf;
+	size_t namelen, maillen;
+	struct ident_split ident;
+
+	if (split_ident_line(&ident, in, strlen(in)))
+		return -1;
+
+	namebuf = ident.name_begin;
+	mailbuf = ident.mail_begin;
+	namelen = ident.name_end - ident.name_begin;
+	maillen = ident.mail_end - ident.mail_begin;
+
+	map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
+	strbuf_add(out, namebuf, namelen);
+	if (log->email)
+		strbuf_addf(out, " <%.*s>", (int)maillen, mailbuf);
+
+	return 0;
+}
+
 static void read_from_stdin(struct shortlog *log)
 {
 	struct strbuf author = STRBUF_INIT;
+	struct strbuf mapped_author = STRBUF_INIT;
 	struct strbuf oneline = STRBUF_INIT;
 	static const char *author_match[2] = { "Author: ", "author " };
 	static const char *committer_match[2] = { "Commit: ", "committer " };
@@ -134,9 +140,15 @@ static void read_from_stdin(struct shortlog *log)
 		while (strbuf_getline_lf(&oneline, stdin) != EOF &&
 		       !oneline.len)
 			; /* discard blanks */
-		insert_one_record(log, v, oneline.buf);
+
+		strbuf_reset(&mapped_author);
+		if (parse_stdin_author(log, &mapped_author, v) < 0)
+			continue;
+
+		insert_one_record(log, mapped_author.buf, oneline.buf);
 	}
 	strbuf_release(&author);
+	strbuf_release(&mapped_author);
 	strbuf_release(&oneline);
 }
 
@@ -153,7 +165,9 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
 	ctx.date_mode.type = DATE_NORMAL;
 	ctx.output_encoding = get_log_output_encoding();
 
-	fmt = log->committer ? "%cn <%ce>" : "%an <%ae>";
+	fmt = log->committer ?
+		(log->email ? "%cN <%cE>" : "%cN") :
+		(log->email ? "%aN <%aE>" : "%aN");
 
 	format_commit_message(commit, fmt, &author, &ctx);
 	if (!log->summary) {
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7073a3eb9..6fa1f62a8 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -393,7 +393,7 @@ static int append_head_ref(const char *refname, const struct object_id *oid,
 	/* If both heads/foo and tags/foo exists, get_sha1 would
 	 * get confused.
 	 */
-	if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
+	if (get_oid(refname + ofs, &tmp) || oidcmp(&tmp, oid))
 		ofs = 5;
 	return append_ref(refname + ofs, oid, 0);
 }
@@ -408,7 +408,7 @@ static int append_remote_ref(const char *refname, const struct object_id *oid,
 	/* If both heads/foo and tags/foo exists, get_sha1 would
 	 * get confused.
 	 */
-	if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
+	if (get_oid(refname + ofs, &tmp) || oidcmp(&tmp, oid))
 		ofs = 5;
 	return append_ref(refname + ofs, oid, 0);
 }
@@ -514,7 +514,7 @@ static int show_independent(struct commit **rev,
 static void append_one_rev(const char *av)
 {
 	struct object_id revkey;
-	if (!get_sha1(av, revkey.hash)) {
+	if (!get_oid(av, &revkey)) {
 		append_ref(av, &revkey, 0);
 		return;
 	}
@@ -808,7 +808,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			die(Q_("cannot handle more than %d rev.",
 			       "cannot handle more than %d revs.",
 			       MAX_REVS), MAX_REVS);
-		if (get_sha1(ref_name[num_rev], revkey.hash))
+		if (get_oid(ref_name[num_rev], &revkey))
 			die(_("'%s' is not a valid ref."), ref_name[num_rev]);
 		commit = lookup_commit_reference(&revkey);
 		if (!commit)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 895555c93..06ed02f99 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -17,9 +17,8 @@
 static char *get_default_remote(void)
 {
 	char *dest = NULL, *ret;
-	unsigned char sha1[20];
 	struct strbuf sb = STRBUF_INIT;
-	const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+	const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
 
 	if (!refname)
 		die(_("No such ref: %s"), "HEAD");
@@ -275,8 +274,6 @@ static void module_list_active(struct module_list *list)
 	int i;
 	struct module_list active_modules = MODULE_LIST_INIT;
 
-	gitmodules_config();
-
 	for (i = 0; i < list->nr; i++) {
 		const struct cache_entry *ce = list->entries[i];
 
@@ -337,9 +334,6 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
 	struct strbuf sb = STRBUF_INIT;
 	char *upd = NULL, *url = NULL, *displaypath;
 
-	/* Only loads from .gitmodules, no overlay with .git/config */
-	gitmodules_config();
-
 	if (prefix && get_super_prefix())
 		die("BUG: cannot have prefix and superprefix");
 	else if (prefix)
@@ -350,7 +344,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
 	} else
 		displaypath = xstrdup(path);
 
-	sub = submodule_from_path(null_sha1, path);
+	sub = submodule_from_path(&null_oid, path);
 
 	if (!sub)
 		die(_("No url found for submodule path '%s' in .gitmodules"),
@@ -475,8 +469,7 @@ static int module_name(int argc, const char **argv, const char *prefix)
 	if (argc != 2)
 		usage(_("git submodule--helper name <path>"));
 
-	gitmodules_config();
-	sub = submodule_from_path(null_sha1, argv[1]);
+	sub = submodule_from_path(&null_oid, argv[1]);
 
 	if (!sub)
 		die(_("no submodule mapping found in .gitmodules for path '%s'"),
@@ -780,6 +773,10 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 					   struct strbuf *out)
 {
 	const struct submodule *sub = NULL;
+	const char *url = NULL;
+	const char *update_string;
+	enum submodule_update_type update_type;
+	char *key;
 	struct strbuf displaypath_sb = STRBUF_INIT;
 	struct strbuf sb = STRBUF_INIT;
 	const char *displaypath = NULL;
@@ -795,7 +792,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		goto cleanup;
 	}
 
-	sub = submodule_from_path(null_sha1, ce->name);
+	sub = submodule_from_path(&null_oid, ce->name);
 
 	if (suc->recursive_prefix)
 		displaypath = relative_path(suc->recursive_prefix,
@@ -808,9 +805,17 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		goto cleanup;
 	}
 
+	key = xstrfmt("submodule.%s.update", sub->name);
+	if (!repo_config_get_string_const(the_repository, key, &update_string)) {
+		update_type = parse_submodule_update_type(update_string);
+	} else {
+		update_type = sub->update_strategy.type;
+	}
+	free(key);
+
 	if (suc->update.type == SM_UPDATE_NONE
 	    || (suc->update.type == SM_UPDATE_UNSPECIFIED
-		&& sub->update_strategy.type == SM_UPDATE_NONE)) {
+		&& update_type == SM_UPDATE_NONE)) {
 		strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
 		strbuf_addch(out, '\n');
 		goto cleanup;
@@ -823,6 +828,11 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 	}
 
 	strbuf_reset(&sb);
+	strbuf_addf(&sb, "submodule.%s.url", sub->name);
+	if (repo_config_get_string_const(the_repository, sb.buf, &url))
+		url = sub->url;
+
+	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/.git", ce->name);
 	needs_cloning = !file_exists(sb.buf);
 
@@ -851,7 +861,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		argv_array_push(&child->args, "--depth=1");
 	argv_array_pushl(&child->args, "--path", sub->path, NULL);
 	argv_array_pushl(&child->args, "--name", sub->name, NULL);
-	argv_array_pushl(&child->args, "--url", sub->url, NULL);
+	argv_array_pushl(&child->args, "--url", url, NULL);
 	if (suc->references.nr) {
 		struct string_list_item *item;
 		for_each_string_list_item(item, &suc->references)
@@ -960,10 +970,19 @@ static int update_clone_task_finished(int result,
 	return 0;
 }
 
+static int gitmodules_update_clone_config(const char *var, const char *value,
+					  void *cb)
+{
+	int *max_jobs = cb;
+	if (!strcmp(var, "submodule.fetchjobs"))
+		*max_jobs = parse_submodule_fetchjobs(var, value);
+	return 0;
+}
+
 static int update_clone(int argc, const char **argv, const char *prefix)
 {
 	const char *update = NULL;
-	int max_jobs = -1;
+	int max_jobs = 1;
 	struct string_list_item *item;
 	struct pathspec pathspec;
 	struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
@@ -1000,6 +1019,9 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 	};
 	suc.prefix = prefix;
 
+	config_from_gitmodules(gitmodules_update_clone_config, &max_jobs);
+	git_config(gitmodules_update_clone_config, &max_jobs);
+
 	argc = parse_options(argc, argv, prefix, module_update_clone_options,
 			     git_submodule_helper_usage, 0);
 
@@ -1013,13 +1035,6 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 	if (pathspec.nr)
 		suc.warn_if_uninitialized = 1;
 
-	/* Overlay the parsed .gitmodules file with .git/config */
-	gitmodules_config();
-	git_config(submodule_config, NULL);
-
-	if (max_jobs < 0)
-		max_jobs = parallel_submodules();
-
 	run_processes_parallel(max_jobs,
 			       update_clone_get_next_task,
 			       update_clone_start_failure,
@@ -1057,19 +1072,23 @@ static int resolve_relative_path(int argc, const char **argv, const char *prefix
 static const char *remote_submodule_branch(const char *path)
 {
 	const struct submodule *sub;
-	gitmodules_config();
-	git_config(submodule_config, NULL);
+	const char *branch = NULL;
+	char *key;
 
-	sub = submodule_from_path(null_sha1, path);
+	sub = submodule_from_path(&null_oid, path);
 	if (!sub)
 		return NULL;
 
-	if (!sub->branch)
+	key = xstrfmt("submodule.%s.branch", sub->name);
+	if (repo_config_get_string_const(the_repository, key, &branch))
+		branch = sub->branch;
+	free(key);
+
+	if (!branch)
 		return "master";
 
-	if (!strcmp(sub->branch, ".")) {
-		unsigned char sha1[20];
-		const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+	if (!strcmp(branch, ".")) {
+		const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
 
 		if (!refname)
 			die(_("No such ref: %s"), "HEAD");
@@ -1085,7 +1104,7 @@ static const char *remote_submodule_branch(const char *path)
 		return refname;
 	}
 
-	return sub->branch;
+	return branch;
 }
 
 static int resolve_remote_submodule_branch(int argc, const char **argv,
@@ -1168,6 +1187,7 @@ static int push_check(int argc, const char **argv, const char *prefix)
 						break;
 					die("HEAD does not match the named branch in the superproject");
 				}
+				/* fallthrough */
 			default:
 				die("src refspec '%s' must name a ref",
 				    rs->src);
@@ -1204,9 +1224,6 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, embed_gitdir_options,
 			     git_submodule_helper_usage, 0);
 
-	gitmodules_config();
-	git_config(submodule_config, NULL);
-
 	if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
 		return 1;
 
@@ -1222,8 +1239,6 @@ static int is_active(int argc, const char **argv, const char *prefix)
 	if (argc != 2)
 		die("submodule--helper is-active takes exactly 1 argument");
 
-	gitmodules_config();
-
 	return !is_submodule_active(the_repository, argv[1]);
 }
 
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index df75cb9d4..17aabaa67 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -12,9 +12,8 @@ static const char * const git_symbolic_ref_usage[] = {
 
 static int check_symref(const char *HEAD, int quiet, int shorten, int print)
 {
-	unsigned char sha1[20];
 	int flag;
-	const char *refname = resolve_ref_unsafe(HEAD, 0, sha1, &flag);
+	const char *refname = resolve_ref_unsafe(HEAD, 0, NULL, &flag);
 
 	if (!refname)
 		die("No such ref: %s", HEAD);
diff --git a/builtin/tag.c b/builtin/tag.c
index 00382a56f..b38329b59 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -113,7 +113,7 @@ static int verify_tag(const char *name, const char *ref,
 	if (format->format)
 		flags = GPG_VERIFY_OMIT_STATUS;
 
-	if (gpg_verify_tag(oid->hash, name, flags))
+	if (gpg_verify_tag(oid, name, flags))
 		return -1;
 
 	if (format->format)
@@ -553,9 +553,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))
 		printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev.hash, DEFAULT_ABBREV));
 
-	strbuf_release(&err);
-	strbuf_release(&buf);
-	strbuf_release(&ref);
-	strbuf_release(&reflog_msg);
+	UNLEAK(buf);
+	UNLEAK(ref);
+	UNLEAK(reflog_msg);
+	UNLEAK(msg);
+	UNLEAK(err);
 	return 0;
 }
diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 73f133419..32e015557 100644
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -1,7 +1,7 @@
 #include "builtin.h"
 #include "config.h"
 
-static char *create_temp_file(unsigned char *sha1)
+static char *create_temp_file(struct object_id *oid)
 {
 	static char path[50];
 	void *buf;
@@ -9,13 +9,13 @@ static char *create_temp_file(unsigned char *sha1)
 	unsigned long size;
 	int fd;
 
-	buf = read_sha1_file(sha1, &type, &size);
+	buf = read_sha1_file(oid->hash, &type, &size);
 	if (!buf || type != OBJ_BLOB)
-		die("unable to read blob object %s", sha1_to_hex(sha1));
+		die("unable to read blob object %s", oid_to_hex(oid));
 
 	xsnprintf(path, sizeof(path), ".merge_file_XXXXXX");
 	fd = xmkstemp(path);
-	if (write_in_full(fd, buf, size) != size)
+	if (write_in_full(fd, buf, size) < 0)
 		die_errno("unable to write temp-file");
 	close(fd);
 	return path;
@@ -23,15 +23,15 @@ static char *create_temp_file(unsigned char *sha1)
 
 int cmd_unpack_file(int argc, const char **argv, const char *prefix)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 
 	if (argc != 2 || !strcmp(argv[1], "-h"))
 		usage("git unpack-file <sha1>");
-	if (get_sha1(argv[1], sha1))
+	if (get_oid(argv[1], &oid))
 		die("Not a valid object name %s", argv[1]);
 
 	git_config(git_default_config, NULL);
 
-	puts(create_temp_file(sha1));
+	puts(create_temp_file(&oid));
 	return 0;
 }
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 689a29fac..62ea264c4 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -394,7 +394,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 		lo = 0;
 		hi = nr;
 		while (lo < hi) {
-			mid = (lo + hi)/2;
+			mid = lo + (hi - lo) / 2;
 			if (base_offset < obj_list[mid].offset) {
 				hi = mid;
 			} else if (base_offset > obj_list[mid].offset) {
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 56721cf03..bf7420b80 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -280,15 +280,17 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
 	fill_stat_cache_info(ce, st);
 	ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
 
-	if (index_path(ce->oid.hash, path, st,
+	if (index_path(&ce->oid, path, st,
 		       info_only ? 0 : HASH_WRITE_OBJECT)) {
 		free(ce);
 		return -1;
 	}
 	option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 	option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
-	if (add_cache_entry(ce, option))
+	if (add_cache_entry(ce, option)) {
+		free(ce);
 		return error("%s: cannot add to the index - missing --add option?", path);
+	}
 	return 0;
 }
 
@@ -915,7 +917,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	struct refresh_params refresh_args = {0, &has_errors};
 	int lock_error = 0;
 	int split_index = -1;
-	struct lock_file *lock_file;
+	struct lock_file lock_file = LOCK_INIT;
 	struct parse_opt_ctx_t ctx;
 	strbuf_getline_fn getline_fn;
 	int parseopt_state = PARSE_OPT_UNKNOWN;
@@ -1014,11 +1016,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 
-	/* We can't free this memory, it becomes part of a linked list parsed atexit() */
-	lock_file = xcalloc(1, sizeof(struct lock_file));
-
 	/* we will diagnose later if it turns out that we need to update it */
-	newfd = hold_locked_index(lock_file, 0);
+	newfd = hold_locked_index(&lock_file, 0);
 	if (newfd < 0)
 		lock_error = errno;
 
@@ -1153,11 +1152,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 				exit(128);
 			unable_to_lock_die(get_index_file(), lock_error);
 		}
-		if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+		if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 			die("Unable to write new index file");
 	}
 
-	rollback_lock_file(lock_file);
+	rollback_lock_file(&lock_file);
 
 	return has_errors ? 1 : 0;
 }
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 40ccfc193..6b90c5dea 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -94,10 +94,10 @@ static char *parse_refname(struct strbuf *input, const char **next)
  * provided but cannot be converted to a SHA-1, die.  flags can
  * include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY.
  */
-static int parse_next_sha1(struct strbuf *input, const char **next,
-			   unsigned char *sha1,
-			   const char *command, const char *refname,
-			   int flags)
+static int parse_next_oid(struct strbuf *input, const char **next,
+			  struct object_id *oid,
+			  const char *command, const char *refname,
+			  int flags)
 {
 	struct strbuf arg = STRBUF_INIT;
 	int ret = 0;
@@ -115,11 +115,11 @@ static int parse_next_sha1(struct strbuf *input, const char **next,
 		(*next)++;
 		*next = parse_arg(*next, &arg);
 		if (arg.len) {
-			if (get_sha1(arg.buf, sha1))
+			if (get_oid(arg.buf, oid))
 				goto invalid;
 		} else {
 			/* Without -z, an empty value means all zeros: */
-			hashclr(sha1);
+			oidclr(oid);
 		}
 	} else {
 		/* With -z, read the next NUL-terminated line */
@@ -133,13 +133,13 @@ static int parse_next_sha1(struct strbuf *input, const char **next,
 		*next += arg.len;
 
 		if (arg.len) {
-			if (get_sha1(arg.buf, sha1))
+			if (get_oid(arg.buf, oid))
 				goto invalid;
 		} else if (flags & PARSE_SHA1_ALLOW_EMPTY) {
 			/* With -z, treat an empty value as all zeros: */
 			warning("%s %s: missing <newvalue>, treating as zero",
 				command, refname);
-			hashclr(sha1);
+			oidclr(oid);
 		} else {
 			/*
 			 * With -z, an empty non-required value means
@@ -182,26 +182,25 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
-	unsigned char new_sha1[20];
-	unsigned char old_sha1[20];
+	struct object_id new_oid, old_oid;
 	int have_old;
 
 	refname = parse_refname(input, &next);
 	if (!refname)
 		die("update: missing <ref>");
 
-	if (parse_next_sha1(input, &next, new_sha1, "update", refname,
-			    PARSE_SHA1_ALLOW_EMPTY))
+	if (parse_next_oid(input, &next, &new_oid, "update", refname,
+			   PARSE_SHA1_ALLOW_EMPTY))
 		die("update %s: missing <newvalue>", refname);
 
-	have_old = !parse_next_sha1(input, &next, old_sha1, "update", refname,
-				    PARSE_SHA1_OLD);
+	have_old = !parse_next_oid(input, &next, &old_oid, "update", refname,
+				   PARSE_SHA1_OLD);
 
 	if (*next != line_termination)
 		die("update %s: extra input: %s", refname, next);
 
 	if (ref_transaction_update(transaction, refname,
-				   new_sha1, have_old ? old_sha1 : NULL,
+				   new_oid.hash, have_old ? old_oid.hash : NULL,
 				   update_flags | create_reflog_flag,
 				   msg, &err))
 		die("%s", err.buf);
@@ -218,22 +217,22 @@ static const char *parse_cmd_create(struct ref_transaction *transaction,
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
-	unsigned char new_sha1[20];
+	struct object_id new_oid;
 
 	refname = parse_refname(input, &next);
 	if (!refname)
 		die("create: missing <ref>");
 
-	if (parse_next_sha1(input, &next, new_sha1, "create", refname, 0))
+	if (parse_next_oid(input, &next, &new_oid, "create", refname, 0))
 		die("create %s: missing <newvalue>", refname);
 
-	if (is_null_sha1(new_sha1))
+	if (is_null_oid(&new_oid))
 		die("create %s: zero <newvalue>", refname);
 
 	if (*next != line_termination)
 		die("create %s: extra input: %s", refname, next);
 
-	if (ref_transaction_create(transaction, refname, new_sha1,
+	if (ref_transaction_create(transaction, refname, new_oid.hash,
 				   update_flags | create_reflog_flag,
 				   msg, &err))
 		die("%s", err.buf);
@@ -250,18 +249,18 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
-	unsigned char old_sha1[20];
+	struct object_id old_oid;
 	int have_old;
 
 	refname = parse_refname(input, &next);
 	if (!refname)
 		die("delete: missing <ref>");
 
-	if (parse_next_sha1(input, &next, old_sha1, "delete", refname,
-			    PARSE_SHA1_OLD)) {
+	if (parse_next_oid(input, &next, &old_oid, "delete", refname,
+			   PARSE_SHA1_OLD)) {
 		have_old = 0;
 	} else {
-		if (is_null_sha1(old_sha1))
+		if (is_null_oid(&old_oid))
 			die("delete %s: zero <oldvalue>", refname);
 		have_old = 1;
 	}
@@ -270,7 +269,7 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
 		die("delete %s: extra input: %s", refname, next);
 
 	if (ref_transaction_delete(transaction, refname,
-				   have_old ? old_sha1 : NULL,
+				   have_old ? old_oid.hash : NULL,
 				   update_flags, msg, &err))
 		die("%s", err.buf);
 
@@ -286,20 +285,20 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
-	unsigned char old_sha1[20];
+	struct object_id old_oid;
 
 	refname = parse_refname(input, &next);
 	if (!refname)
 		die("verify: missing <ref>");
 
-	if (parse_next_sha1(input, &next, old_sha1, "verify", refname,
-			    PARSE_SHA1_OLD))
-		hashclr(old_sha1);
+	if (parse_next_oid(input, &next, &old_oid, "verify", refname,
+			   PARSE_SHA1_OLD))
+		oidclr(&old_oid);
 
 	if (*next != line_termination)
 		die("verify %s: extra input: %s", refname, next);
 
-	if (ref_transaction_verify(transaction, refname, old_sha1,
+	if (ref_transaction_verify(transaction, refname, old_oid.hash,
 				   update_flags, &err))
 		die("%s", err.buf);
 
@@ -355,7 +354,7 @@ static void update_refs_stdin(struct ref_transaction *transaction)
 int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
 	const char *refname, *oldval;
-	unsigned char sha1[20], oldsha1[20];
+	struct object_id oid, oldoid;
 	int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0;
 	unsigned int flags = 0;
 	int create_reflog = 0;
@@ -412,7 +411,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 		refname = argv[0];
 		value = argv[1];
 		oldval = argv[2];
-		if (get_sha1(value, sha1))
+		if (get_oid(value, &oid))
 			die("%s: not a valid SHA1", value);
 	}
 
@@ -422,8 +421,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 			 * The empty string implies that the reference
 			 * must not already exist:
 			 */
-			hashclr(oldsha1);
-		else if (get_sha1(oldval, oldsha1))
+			oidclr(&oldoid);
+		else if (get_oid(oldval, &oldoid))
 			die("%s: not a valid old SHA1", oldval);
 	}
 
@@ -435,10 +434,10 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 		 * NULL_SHA1 as "don't care" here:
 		 */
 		return delete_ref(msg, refname,
-				  (oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL,
+				  (oldval && !is_null_oid(&oldoid)) ? oldoid.hash : NULL,
 				  flags);
 	else
-		return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
+		return update_ref(msg, refname, oid.hash, oldval ? oldoid.hash : NULL,
 				  flags | create_reflog_flag,
 				  UPDATE_REFS_DIE_ON_ERR);
 }
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 87d73e856..ad7b79fa5 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -58,20 +58,21 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
 	}
 
 	while (i < argc) {
-		unsigned char sha1[20];
+		struct object_id oid;
 		const char *name = argv[i++];
-		if (get_sha1(name, sha1)) {
+
+		if (get_oid(name, &oid)) {
 			had_error = !!error("tag '%s' not found.", name);
 			continue;
 		}
 
-		if (gpg_verify_tag(sha1, name, flags)) {
+		if (gpg_verify_tag(&oid, name, flags)) {
 			had_error = 1;
 			continue;
 		}
 
 		if (format.format)
-			pretty_print_ref(name, sha1, &format);
+			pretty_print_ref(name, oid.hash, &format);
 	}
 	return had_error;
 }
diff --git a/builtin/worktree.c b/builtin/worktree.c
index c98e2ce5f..7b9307aa5 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -38,7 +38,9 @@ static int prune_worktree(const char *id, struct strbuf *reason)
 {
 	struct stat st;
 	char *path;
-	int fd, len;
+	int fd;
+	size_t len;
+	ssize_t read_result;
 
 	if (!is_directory(git_path("worktrees/%s", id))) {
 		strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
@@ -56,10 +58,26 @@ static int prune_worktree(const char *id, struct strbuf *reason)
 			    id, strerror(errno));
 		return 1;
 	}
-	len = st.st_size;
+	len = xsize_t(st.st_size);
 	path = xmallocz(len);
-	read_in_full(fd, path, len);
+
+	read_result = read_in_full(fd, path, len);
+	if (read_result < 0) {
+		strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
+			    id, strerror(errno));
+		close(fd);
+		free(path);
+		return 1;
+	}
 	close(fd);
+
+	if (read_result != len) {
+		strbuf_addf(reason,
+			    _("Removing worktrees/%s: short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
+			    id, (uintmax_t)len, (uintmax_t)read_result);
+		free(path);
+		return 1;
+	}
 	while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
 		len--;
 	if (!len) {
@@ -381,6 +399,8 @@ static int add(int ac, const char **av, const char *prefix)
 		branch = opts.new_branch;
 	}
 
+	UNLEAK(path);
+	UNLEAK(opts);
 	return add_worktree(path, branch, &opts);
 }
 
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 5be7ce5c7..3310fd210 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -6,6 +6,7 @@
 #include "csum-file.h"
 #include "pack.h"
 #include "strbuf.h"
+#include "packfile.h"
 
 static struct bulk_checkin_state {
 	unsigned plugged:1;
@@ -114,7 +115,10 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 
 		if (size && !s.avail_in) {
 			ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf);
-			if (read_in_full(fd, ibuf, rsize) != rsize)
+			ssize_t read_result = read_in_full(fd, ibuf, rsize);
+			if (read_result < 0)
+				die_errno("failed to read from '%s'", path);
+			if (read_result != rsize)
 				die("failed to read %d bytes from '%s'",
 				    (int)rsize, path);
 			offset += rsize;
diff --git a/bundle.c b/bundle.c
index d15db03c8..c092d5d68 100644
--- a/bundle.c
+++ b/bundle.c
@@ -157,9 +157,14 @@ int verify_bundle(struct bundle_header *header, int verbose)
 	req_nr = revs.pending.nr;
 	setup_revisions(2, argv, &revs, NULL);
 
+	/* Save pending objects, so they can be cleaned up later. */
 	refs = revs.pending;
 	revs.leak_pending = 1;
 
+	/*
+	 * prepare_revision_walk (together with .leak_pending = 1) makes us
+	 * the sole owner of the list of pending objects.
+	 */
 	if (prepare_revision_walk(&revs))
 		die(_("revision walk setup failed"));
 
@@ -176,8 +181,10 @@ int verify_bundle(struct bundle_header *header, int verbose)
 				refs.objects[i].name);
 		}
 
+	/* Clean up objects used, as they will be reused. */
 	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
-	free(refs.objects);
+
+	object_array_clear(&refs);
 
 	if (verbose) {
 		struct ref_list *r;
diff --git a/cache-tree.c b/cache-tree.c
index 2440d1dc8..d3f740127 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -49,7 +49,7 @@ static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
 	lo = 0;
 	hi = it->subtree_nr;
 	while (lo < hi) {
-		int mi = (lo + hi) / 2;
+		int mi = lo + (hi - lo) / 2;
 		struct cache_tree_sub *mdl = down[mi];
 		int cmp = subtree_name_cmp(path, pathlen,
 					   mdl->name, mdl->namelen);
@@ -603,19 +603,16 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
 int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
 {
 	int entries, was_valid, newfd;
-	struct lock_file *lock_file;
+	struct lock_file lock_file = LOCK_INIT;
+	int ret = 0;
 
-	/*
-	 * We can't free this memory, it becomes part of a linked list
-	 * parsed atexit()
-	 */
-	lock_file = xcalloc(1, sizeof(struct lock_file));
-
-	newfd = hold_lock_file_for_update(lock_file, index_path, LOCK_DIE_ON_ERROR);
+	newfd = hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
 
 	entries = read_index_from(index_state, index_path);
-	if (entries < 0)
-		return WRITE_TREE_UNREADABLE_INDEX;
+	if (entries < 0) {
+		ret = WRITE_TREE_UNREADABLE_INDEX;
+		goto out;
+	}
 	if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
 		cache_tree_free(&index_state->cache_tree);
 
@@ -624,10 +621,12 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co
 
 	was_valid = cache_tree_fully_valid(index_state->cache_tree);
 	if (!was_valid) {
-		if (cache_tree_update(index_state, flags) < 0)
-			return WRITE_TREE_UNMERGED_INDEX;
+		if (cache_tree_update(index_state, flags) < 0) {
+			ret = WRITE_TREE_UNMERGED_INDEX;
+			goto out;
+		}
 		if (0 <= newfd) {
-			if (!write_locked_index(index_state, lock_file, COMMIT_LOCK))
+			if (!write_locked_index(index_state, &lock_file, COMMIT_LOCK))
 				newfd = -1;
 		}
 		/* Not being able to write is fine -- we are only interested
@@ -641,17 +640,19 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co
 	if (prefix) {
 		struct cache_tree *subtree;
 		subtree = cache_tree_find(index_state->cache_tree, prefix);
-		if (!subtree)
-			return WRITE_TREE_PREFIX_ERROR;
+		if (!subtree) {
+			ret = WRITE_TREE_PREFIX_ERROR;
+			goto out;
+		}
 		hashcpy(sha1, subtree->oid.hash);
 	}
 	else
 		hashcpy(sha1, index_state->cache_tree->oid.hash);
 
+out:
 	if (0 <= newfd)
-		rollback_lock_file(lock_file);
-
-	return 0;
+		rollback_lock_file(&lock_file);
+	return ret;
 }
 
 int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
diff --git a/cache.h b/cache.h
index 849bc0dcd..6440e2bf2 100644
--- a/cache.h
+++ b/cache.h
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "strbuf.h"
 #include "hashmap.h"
+#include "mru.h"
 #include "advice.h"
 #include "gettext.h"
 #include "convert.h"
@@ -417,7 +418,6 @@ static inline enum object_type object_type(unsigned int mode)
 #define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
 #define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX"
 #define GIT_SUPER_PREFIX_ENVIRONMENT "GIT_INTERNAL_SUPER_PREFIX"
-#define GIT_TOPLEVEL_PREFIX_ENVIRONMENT "GIT_INTERNAL_TOPLEVEL_PREFIX"
 #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
 #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
@@ -433,6 +433,7 @@ static inline enum object_type object_type(unsigned int mode)
 #define GITATTRIBUTES_FILE ".gitattributes"
 #define INFOATTRIBUTES_FILE "info/attributes"
 #define ATTRIBUTE_MACRO_PREFIX "[attr]"
+#define GITMODULES_FILE ".gitmodules"
 #define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
 #define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
 #define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF"
@@ -443,6 +444,7 @@ static inline enum object_type object_type(unsigned int mode)
 #define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
 #define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
 #define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH"
+#define GIT_OPTIONAL_LOCKS_ENVIRONMENT "GIT_OPTIONAL_LOCKS"
 
 /*
  * This environment variable is expected to contain a boolean indicating
@@ -684,8 +686,8 @@ extern int ie_modified(const struct index_state *, const struct cache_entry *, s
 
 #define HASH_WRITE_OBJECT 1
 #define HASH_FORMAT_CHECK 2
-extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
-extern int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned flags);
+extern int index_fd(struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
+extern int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags);
 
 /*
  * Record to sd the data from st that we use to check whether a file
@@ -783,6 +785,11 @@ extern int protect_ntfs;
 extern int ref_paranoia;
 
 /*
+ * Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
+ */
+int use_optional_locks(void);
+
+/*
  * The character that begins a commented line in user-editable file
  * that is subject to stripspace.
  */
@@ -903,20 +910,6 @@ extern void check_repository_format(void);
 extern const char *sha1_file_name(const unsigned char *sha1);
 
 /*
- * Return the name of the (local) packfile with the specified sha1 in
- * its name.  The return value is a pointer to memory that is
- * overwritten each time this function is called.
- */
-extern char *sha1_pack_name(const unsigned char *sha1);
-
-/*
- * Return the name of the (local) pack index file with the specified
- * sha1 in its name.  The return value is a pointer to memory that is
- * overwritten each time this function is called.
- */
-extern char *sha1_pack_index_name(const unsigned char *sha1);
-
-/*
  * Return an abbreviated sha1 unique within this repository's object database.
  * The result will be at least `len` characters long, and will be NUL
  * terminated.
@@ -1192,7 +1185,7 @@ static inline const unsigned char *lookup_replace_object(const unsigned char *sh
 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, unsigned char *sha1, unsigned flags);
+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);
 extern int git_open_cloexec(const char *name, int flags);
@@ -1201,15 +1194,10 @@ extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size);
 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);
 
-/* global flag to enable extra checks when accessing packed objects */
-extern int do_check_packed_object_crc;
-
 extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
 
 extern int finalize_object_file(const char *tmpfile, const char *filename);
 
-extern int has_sha1_pack(const unsigned char *sha1);
-
 /*
  * Open the loose object at path, check its sha1, and return the contents,
  * type, and size. If the object is a blob, then "contents" may return NULL,
@@ -1245,8 +1233,6 @@ 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 int has_pack_index(const unsigned char *sha1);
-
 extern void assert_sha1_type(const unsigned char *sha1, enum object_type expect);
 
 /* Helper to check and "touch" a file */
@@ -1264,8 +1250,8 @@ static inline unsigned int hexval(unsigned char c)
  */
 static inline int hex2chr(const char *s)
 {
-	int val = hexval(s[0]);
-	return (val < 0) ? val : (val << 4) | hexval(s[1]);
+	unsigned int val = hexval(s[0]);
+	return (val & ~0xf) ? val : (val << 4) | hexval(s[1]);
 }
 
 /* Convert to/from hex/sha1 representation */
@@ -1284,38 +1270,37 @@ struct object_context {
 	 */
 	struct strbuf symlink_path;
 	/*
-	 * If GET_SHA1_RECORD_PATH is set, this will record path (if any)
+	 * If GET_OID_RECORD_PATH is set, this will record path (if any)
 	 * found when resolving the name. The caller is responsible for
 	 * releasing the memory.
 	 */
 	char *path;
 };
 
-#define GET_SHA1_QUIETLY           01
-#define GET_SHA1_COMMIT            02
-#define GET_SHA1_COMMITTISH        04
-#define GET_SHA1_TREE             010
-#define GET_SHA1_TREEISH          020
-#define GET_SHA1_BLOB             040
-#define GET_SHA1_FOLLOW_SYMLINKS 0100
-#define GET_SHA1_RECORD_PATH     0200
-#define GET_SHA1_ONLY_TO_DIE    04000
-
-#define GET_SHA1_DISAMBIGUATORS \
-	(GET_SHA1_COMMIT | GET_SHA1_COMMITTISH | \
-	GET_SHA1_TREE | GET_SHA1_TREEISH | \
-	GET_SHA1_BLOB)
-
-extern int get_sha1(const char *str, unsigned char *sha1);
-extern int get_sha1_commit(const char *str, unsigned char *sha1);
-extern int get_sha1_committish(const char *str, unsigned char *sha1);
-extern int get_sha1_tree(const char *str, unsigned char *sha1);
-extern int get_sha1_treeish(const char *str, unsigned char *sha1);
-extern int get_sha1_blob(const char *str, unsigned char *sha1);
-extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
-extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc);
+#define GET_OID_QUIETLY           01
+#define GET_OID_COMMIT            02
+#define GET_OID_COMMITTISH        04
+#define GET_OID_TREE             010
+#define GET_OID_TREEISH          020
+#define GET_OID_BLOB             040
+#define GET_OID_FOLLOW_SYMLINKS 0100
+#define GET_OID_RECORD_PATH     0200
+#define GET_OID_ONLY_TO_DIE    04000
+
+#define GET_OID_DISAMBIGUATORS \
+	(GET_OID_COMMIT | GET_OID_COMMITTISH | \
+	GET_OID_TREE | GET_OID_TREEISH | \
+	GET_OID_BLOB)
 
 extern int get_oid(const char *str, struct object_id *oid);
+extern int get_oid_commit(const char *str, struct object_id *oid);
+extern int get_oid_committish(const char *str, struct object_id *oid);
+extern int get_oid_tree(const char *str, struct object_id *oid);
+extern int get_oid_treeish(const char *str, struct object_id *oid);
+extern int get_oid_blob(const char *str, struct object_id *oid);
+extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
+extern int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc);
+
 
 typedef int each_abbrev_fn(const struct object_id *oid, void *);
 extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
@@ -1611,8 +1596,7 @@ extern struct packed_git {
  * A most-recently-used ordered version of the packed_git list, which can
  * be iterated instead of packed_git (and marked via mru_mark).
  */
-struct mru;
-extern struct mru *packed_git_mru;
+extern struct mru packed_git_mru;
 
 struct pack_entry {
 	off_t offset;
@@ -1620,29 +1604,6 @@ struct pack_entry {
 	struct packed_git *p;
 };
 
-extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
-
-/* A hook to report invalid files in pack directory */
-#define PACKDIR_FILE_PACK 1
-#define PACKDIR_FILE_IDX 2
-#define PACKDIR_FILE_GARBAGE 4
-extern void (*report_garbage)(unsigned seen_bits, const char *path);
-
-extern void prepare_packed_git(void);
-extern void reprepare_packed_git(void);
-extern void install_packed_git(struct packed_git *pack);
-
-/*
- * Give a rough count of objects in the repository. This sacrifices accuracy
- * for speed.
- */
-unsigned long approximate_object_count(void);
-
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
-					 struct packed_git *packs);
-
-extern void pack_report(void);
-
 /*
  * Create a temporary file rooted in the object database directory, or
  * die on failure. The filename is taken from "pattern", which should have the
@@ -1652,15 +1613,6 @@ extern void pack_report(void);
 extern int odb_mkstemp(struct strbuf *template, const char *pattern);
 
 /*
- * Generate the filename to be used for a pack file with checksum "sha1" and
- * extension "ext". The result is written into the strbuf "buf", overwriting
- * any existing contents. A pointer to buf->buf is returned as a convenience.
- *
- * Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
- */
-extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
-
-/*
  * Create a pack .keep file named "name" (which should generally be the output
  * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
  * error.
@@ -1668,67 +1620,6 @@ extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const
 extern int odb_pack_keep(const char *name);
 
 /*
- * mmap the index file for the specified packfile (if it is not
- * already mmapped).  Return 0 on success.
- */
-extern int open_pack_index(struct packed_git *);
-
-/*
- * munmap the index file for the specified packfile (if it is
- * currently mmapped).
- */
-extern void close_pack_index(struct packed_git *);
-
-extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
-extern void close_pack_windows(struct packed_git *);
-extern void close_all_packs(void);
-extern void unuse_pack(struct pack_window **);
-extern void clear_delta_base_cache(void);
-extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
-
-/*
- * Make sure that a pointer access into an mmap'd index file is within bounds,
- * and can provide at least 8 bytes of data.
- *
- * Note that this is only necessary for variable-length segments of the file
- * (like the 64-bit extended offset table), as we compare the size to the
- * fixed-length parts when we open the file.
- */
-extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
-
-/*
- * 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
- * error.
- */
-extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
-/*
- * Like nth_packed_object_sha1, but write the data into the object specified by
- * the the first argument.  Returns the first argument on success, and NULL on
- * error.
- */
-extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
-
-/*
- * Return the offset of the nth object within the specified packfile.
- * The index must already be opened.
- */
-extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
-
-/*
- * If the object named sha1 is present in the specified packfile,
- * return its offset within the packfile; otherwise, return 0.
- */
-extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
-
-extern int is_pack_valid(struct packed_git *);
-extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
-extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
-extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
-extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
-
-/*
  * Iterate over the files in the loose-object parts of the object
  * directory "path", triggering the following callbacks:
  *
@@ -1777,17 +1668,12 @@ int for_each_loose_file_in_objdir_buf(struct strbuf *path,
 				      void *data);
 
 /*
- * Iterate over loose and packed objects in both the local
+ * Iterate over loose objects in both the local
  * repository and any alternates repositories (unless the
  * LOCAL_ONLY flag is set).
  */
 #define FOR_EACH_OBJECT_LOCAL_ONLY 0x1
-typedef int each_packed_object_fn(const struct object_id *oid,
-				  struct packed_git *pack,
-				  uint32_t pos,
-				  void *data);
 extern int for_each_loose_object(each_loose_object_fn, void *, unsigned flags);
-extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
 
 struct object_info {
 	/* Request */
@@ -1837,7 +1723,6 @@ struct object_info {
 /* 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);
-extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);
 
 /* Dumb servers support */
 extern int update_server_info(int);
@@ -1956,6 +1841,8 @@ void shift_tree_by(const struct object_id *, const struct object_id *, struct ob
 #define WS_TRAILING_SPACE      (WS_BLANK_AT_EOL|WS_BLANK_AT_EOF)
 #define WS_DEFAULT_RULE (WS_TRAILING_SPACE|WS_SPACE_BEFORE_TAB|8)
 #define WS_TAB_WIDTH_MASK        077
+/* All WS_* -- when extended, adapt diff.c emit_symbol */
+#define WS_RULE_MASK           07777
 extern unsigned whitespace_rule_cfg;
 extern unsigned whitespace_rule(const char *);
 extern unsigned parse_whitespace_rule(const char *);
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
new file mode 100755
index 000000000..a29246af3
--- /dev/null
+++ b/ci/install-dependencies.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# Install dependencies required to build and test Git on Linux and macOS
+#
+
+. ${0%/*}/lib-travisci.sh
+
+P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
+
+case "${TRAVIS_OS_NAME:-linux}" in
+linux)
+	export GIT_TEST_HTTPD=YesPlease
+
+	mkdir --parents custom/p4
+	pushd custom/p4
+		wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
+		wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
+		chmod u+x p4d
+		chmod u+x p4
+		export PATH="$(pwd):$PATH"
+	popd
+	mkdir --parents custom/git-lfs
+	pushd custom/git-lfs
+		wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+		tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+		cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
+		export PATH="$(pwd):$PATH"
+	popd
+	;;
+osx)
+	brew update --quiet
+	# Uncomment this if you want to run perf tests:
+	# brew install gnu-time
+	brew install git-lfs gettext
+	brew link --force gettext
+	brew install caskroom/cask/perforce
+	;;
+esac
+
+echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
+p4d -V | grep Rev.
+echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
+p4 -V | grep Rev.
+echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
+git-lfs version
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
new file mode 100755
index 000000000..b3ed0a0dd
--- /dev/null
+++ b/ci/lib-travisci.sh
@@ -0,0 +1,28 @@
+# Library of functions shared by all CI scripts
+
+skip_branch_tip_with_tag () {
+	# Sometimes, a branch is pushed at the same time the tag that points
+	# at the same commit as the tip of the branch is pushed, and building
+	# both at the same time is a waste.
+	#
+	# Travis gives a tagname e.g. v2.14.0 in $TRAVIS_BRANCH when
+	# the build is triggered by a push to a tag.  Let's see if
+	# $TRAVIS_BRANCH is exactly at a tag, and if so, if it is
+	# different from $TRAVIS_BRANCH.  That way, we can tell if
+	# we are building the tip of a branch that is tagged and
+	# we can skip the build because we won't be skipping a build
+	# of a tag.
+
+	if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
+		test "$TAG" != "$TRAVIS_BRANCH"
+	then
+		echo "Tip of $TRAVIS_BRANCH is exactly at $TAG"
+		exit 0
+	fi
+}
+
+# Set 'exit on error' for all CI scripts to let the caller know that
+# something went wrong
+set -e
+
+skip_branch_tip_with_tag
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
new file mode 100755
index 000000000..8c8973cbf
--- /dev/null
+++ b/ci/print-test-failures.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Print output of failing tests
+#
+
+. ${0%/*}/lib-travisci.sh
+
+for TEST_EXIT in t/test-results/*.exit
+do
+	if [ "$(cat "$TEST_EXIT")" != "0" ]
+	then
+		TEST_OUT="${TEST_EXIT%exit}out"
+		echo "------------------------------------------------------------------------"
+		echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
+		echo "------------------------------------------------------------------------"
+		cat "${TEST_OUT}"
+	fi
+done
diff --git a/ci/run-build.sh b/ci/run-build.sh
new file mode 100755
index 000000000..4f940d103
--- /dev/null
+++ b/ci/run-build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Build Git
+#
+
+. ${0%/*}/lib-travisci.sh
+
+make --jobs=2
diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh
new file mode 100755
index 000000000..0edf63acf
--- /dev/null
+++ b/ci/run-linux32-docker.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Download and run Docker image to build and test 32-bit Git
+#
+
+. ${0%/*}/lib-travisci.sh
+
+docker pull daald/ubuntu32:xenial
+
+# Use the following command to debug the docker build locally:
+# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
+# root@container:/# /usr/src/git/ci/run-linux32-build.sh
+
+docker run \
+	--interactive \
+	--env DEVELOPER \
+	--env DEFAULT_TEST_TARGET \
+	--env GIT_PROVE_OPTS \
+	--env GIT_TEST_OPTS \
+	--env GIT_TEST_CLONE_2GB \
+	--volume "${PWD}:/usr/src/git" \
+	daald/ubuntu32:xenial \
+	/usr/src/git/ci/run-linux32-build.sh $(id -u $USER)
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
new file mode 100755
index 000000000..68dd0f080
--- /dev/null
+++ b/ci/run-static-analysis.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Perform various static code analysis checks
+#
+
+. ${0%/*}/lib-travisci.sh
+
+make coccicheck
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
new file mode 100755
index 000000000..f0c743de9
--- /dev/null
+++ b/ci/run-tests.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Test Git
+#
+
+. ${0%/*}/lib-travisci.sh
+
+mkdir -p $HOME/travis-cache
+ln -s $HOME/travis-cache/.prove t/.prove
+make --quiet test
diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh
index 2d98f6b2f..8757b3a97 100755
--- a/ci/run-windows-build.sh
+++ b/ci/run-windows-build.sh
@@ -6,6 +6,8 @@
 # supported) and a commit hash.
 #
 
+. ${0%/*}/lib-travisci.sh
+
 test $# -ne 2 && echo "Unexpected number of parameters" && exit 1
 test -z "$GFW_CI_TOKEN" && echo "GFW_CI_TOKEN not defined" && exit
 
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index 6214e6acb..7a0a848e8 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -3,7 +3,9 @@
 # Perform sanity checks on documentation and build it.
 #
 
-set -e
+. ${0%/*}/lib-travisci.sh
+
+gem install asciidoctor
 
 make check-builtins
 make check-docs
diff --git a/color.c b/color.c
index 31b6207a0..9a9261ac1 100644
--- a/color.c
+++ b/color.c
@@ -338,6 +338,13 @@ static int check_auto_color(void)
 
 int want_color(int var)
 {
+	/*
+	 * NEEDSWORK: This function is sometimes used from multiple threads, and
+	 * we end up using want_auto racily. That "should not matter" since
+	 * we always write the same value, but it's still wrong. This function
+	 * is listed in .tsan-suppressions for the time being.
+	 */
+
 	static int want_auto = -1;
 
 	if (var < 0)
diff --git a/color.h b/color.h
index 90627650f..fd2b688df 100644
--- a/color.h
+++ b/color.h
@@ -42,6 +42,8 @@ struct strbuf;
 #define GIT_COLOR_BG_BLUE	"\033[44m"
 #define GIT_COLOR_BG_MAGENTA	"\033[45m"
 #define GIT_COLOR_BG_CYAN	"\033[46m"
+#define GIT_COLOR_FAINT		"\033[2m"
+#define GIT_COLOR_FAINT_ITALIC	"\033[2;3m"
 
 /* A special value meaning "no color selected" */
 #define GIT_COLOR_NIL "NIL"
diff --git a/commit-slab.h b/commit-slab.h
index 333d81e37..dcaab8ca0 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -78,7 +78,7 @@ static MAYBE_UNUSED void init_ ##slabname(struct slabname *s)		\
 									\
 static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s)		\
 {									\
-	int i;								\
+	unsigned int i;							\
 	for (i = 0; i < s->slab_count; i++)				\
 		free(s->slab[i]);					\
 	s->slab_count = 0;						\
@@ -89,13 +89,13 @@ static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s,	\
 						  const struct commit *c, \
 						  int add_if_missing)   \
 {									\
-	int nth_slab, nth_slot;						\
+	unsigned int nth_slab, nth_slot;				\
 									\
 	nth_slab = c->index / s->slab_size;				\
 	nth_slot = c->index % s->slab_size;				\
 									\
 	if (s->slab_count <= nth_slab) {				\
-		int i;							\
+		unsigned int i;						\
 		if (!add_if_missing)					\
 			return NULL;					\
 		REALLOC_ARRAY(s->slab, nth_slab + 1);			\
diff --git a/commit.c b/commit.c
index d3150d627..1e0e63379 100644
--- a/commit.c
+++ b/commit.c
@@ -59,7 +59,7 @@ struct commit *lookup_commit_reference_by_name(const char *name)
 	struct object_id oid;
 	struct commit *commit;
 
-	if (get_sha1_committish(name, oid.hash))
+	if (get_oid_committish(name, &oid))
 		return NULL;
 	commit = lookup_commit_reference(&oid);
 	if (parse_commit(commit))
@@ -134,35 +134,41 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 	return 0;
 }
 
-struct commit_graft *read_graft_line(char *buf, int len)
+struct commit_graft *read_graft_line(struct strbuf *line)
 {
 	/* The format is just "Commit Parent1 Parent2 ...\n" */
-	int i;
+	int i, phase;
+	const char *tail = NULL;
 	struct commit_graft *graft = NULL;
-	const int entry_size = GIT_SHA1_HEXSZ + 1;
+	struct object_id dummy_oid, *oid;
 
-	while (len && isspace(buf[len-1]))
-		buf[--len] = '\0';
-	if (buf[0] == '#' || buf[0] == '\0')
+	strbuf_rtrim(line);
+	if (!line->len || line->buf[0] == '#')
 		return NULL;
-	if ((len + 1) % entry_size)
-		goto bad_graft_data;
-	i = (len + 1) / entry_size - 1;
-	graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));
-	graft->nr_parent = i;
-	if (get_oid_hex(buf, &graft->oid))
-		goto bad_graft_data;
-	for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {
-		if (buf[i] != ' ')
-			goto bad_graft_data;
-		if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))
+	/*
+	 * phase 0 verifies line, counts hashes in line and allocates graft
+	 * phase 1 fills graft
+	 */
+	for (phase = 0; phase < 2; phase++) {
+		oid = graft ? &graft->oid : &dummy_oid;
+		if (parse_oid_hex(line->buf, oid, &tail))
 			goto bad_graft_data;
+		for (i = 0; *tail != '\0'; i++) {
+			oid = graft ? &graft->parent[i] : &dummy_oid;
+			if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
+				goto bad_graft_data;
+		}
+		if (!graft) {
+			graft = xmalloc(st_add(sizeof(*graft),
+					       st_mult(sizeof(struct object_id), i)));
+			graft->nr_parent = i;
+		}
 	}
 	return graft;
 
 bad_graft_data:
-	error("bad graft data: %s", buf);
-	free(graft);
+	error("bad graft data: %s", line->buf);
+	assert(!graft);
 	return NULL;
 }
 
@@ -174,7 +180,7 @@ static int read_graft_file(const char *graft_file)
 		return -1;
 	while (!strbuf_getwholeline(&buf, fp, '\n')) {
 		/* The format is just "Commit Parent1 Parent2 ...\n" */
-		struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
+		struct commit_graft *graft = read_graft_line(&buf);
 		if (!graft)
 			continue;
 		if (register_commit_graft(graft, 1))
@@ -199,11 +205,11 @@ static void prepare_commit_graft(void)
 	commit_graft_prepared = 1;
 }
 
-struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
+struct commit_graft *lookup_commit_graft(const struct object_id *oid)
 {
 	int pos;
 	prepare_commit_graft();
-	pos = commit_graft_pos(sha1);
+	pos = commit_graft_pos(oid->hash);
 	if (pos < 0)
 		return NULL;
 	return commit_graft[pos];
@@ -334,7 +340,7 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s
 	bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
 	pptr = &item->parents;
 
-	graft = lookup_commit_graft(item->object.oid.hash);
+	graft = lookup_commit_graft(&item->object.oid);
 	while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
 		struct commit *new_parent;
 
@@ -1080,6 +1086,7 @@ struct commit_list *reduce_heads(struct commit_list *heads)
 	num_head = remove_redundant(array, num_head);
 	for (i = 0; i < num_head; i++)
 		tail = &commit_list_insert(array[i], tail)->next;
+	free(array);
 	return result;
 }
 
@@ -1564,10 +1571,13 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 	if (encoding_is_utf8 && !verify_utf8(&buffer))
 		fprintf(stderr, _(commit_utf8_warn));
 
-	if (sign_commit && do_sign_commit(&buffer, sign_commit))
-		return -1;
+	if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
+		result = -1;
+		goto out;
+	}
 
 	result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
+out:
 	strbuf_release(&buffer);
 	return result;
 }
@@ -1586,7 +1596,7 @@ struct commit *get_merge_parent(const char *name)
 	struct object *obj;
 	struct commit *commit;
 	struct object_id oid;
-	if (get_sha1(name, oid.hash))
+	if (get_oid(name, &oid))
 		return NULL;
 	obj = parse_object(&oid);
 	commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
diff --git a/commit.h b/commit.h
index f3805fec6..6d769590f 100644
--- a/commit.h
+++ b/commit.h
@@ -247,9 +247,9 @@ struct commit_graft {
 };
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 
-struct commit_graft *read_graft_line(char *buf, int len);
+struct commit_graft *read_graft_line(struct strbuf *line);
 int register_commit_graft(struct commit_graft *, int);
-struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
+struct commit_graft *lookup_commit_graft(const struct object_id *oid);
 
 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
 extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index d4121f2f4..98342b831 100644
--- a/compat/regex/regex_internal.c
+++ b/compat/regex/regex_internal.c
@@ -613,7 +613,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
 	      int low = 0, high = pstr->valid_len, mid;
 	      do
 		{
-		  mid = (high + low) / 2;
+		  mid = low + (high - low) / 2;
 		  if (pstr->offsets[mid] > offset)
 		    high = mid;
 		  else if (pstr->offsets[mid] < offset)
@@ -1394,7 +1394,7 @@ re_node_set_contains (const re_node_set *set, int elem)
   right = set->nelem - 1;
   while (idx < right)
     {
-      mid = (idx + right) / 2;
+      mid = idx + (right - idx) / 2;
       if (set->elems[mid] < elem)
 	idx = mid + 1;
       else
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index 0a745d9c3..6f2b48a78 100644
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -4284,7 +4284,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)
   last = right = mctx->nbkref_ents;
   for (left = 0; left < right;)
     {
-      mid = (left + right) / 2;
+      mid = left + (right - left) / 2;
       if (mctx->bkref_ents[mid].str_idx < str_idx)
 	left = mid + 1;
       else
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
new file mode 100644
index 000000000..9e631c859
--- /dev/null
+++ b/compat/win32/lazyload.h
@@ -0,0 +1,57 @@
+#ifndef LAZYLOAD_H
+#define LAZYLOAD_H
+
+/*
+ * A pair of macros to simplify loading of DLL functions. Example:
+ *
+ *   DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW,
+ *                     LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
+ *
+ *   if (!INIT_PROC_ADDR(CreateHardLinkW))
+ *           return error("Could not find CreateHardLinkW() function";
+ *
+ *   if (!CreateHardLinkW(source, target, NULL))
+ *           return error("could not create hardlink from %S to %S",
+ *                        source, target);
+ */
+
+struct proc_addr {
+	const char *const dll;
+	const char *const function;
+	FARPROC pfunction;
+	unsigned initialized : 1;
+};
+
+/* Declares a function to be loaded dynamically from a DLL. */
+#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
+	static struct proc_addr proc_addr_##function = \
+	{ #dll, #function, NULL, 0 }; \
+	static rettype (WINAPI *function)(__VA_ARGS__)
+
+/*
+ * Loads a function from a DLL (once-only).
+ * Returns non-NULL function pointer on success.
+ * Returns NULL + errno == ENOSYS on failure.
+ * This function is not thread-safe.
+ */
+#define INIT_PROC_ADDR(function) \
+	(function = get_proc_addr(&proc_addr_##function))
+
+static inline void *get_proc_addr(struct proc_addr *proc)
+{
+	/* only do this once */
+	if (!proc->initialized) {
+		HANDLE hnd;
+		proc->initialized = 1;
+		hnd = LoadLibraryExA(proc->dll, NULL,
+				     LOAD_LIBRARY_SEARCH_SYSTEM32);
+		if (hnd)
+			proc->pfunction = GetProcAddress(hnd, proc->function);
+	}
+	/* set ENOSYS if DLL or function was not found */
+	if (!proc->pfunction)
+		errno = ENOSYS;
+	return proc->pfunction;
+}
+
+#endif
diff --git a/config.c b/config.c
index c6bc2ff71..adb7d7a3e 100644
--- a/config.c
+++ b/config.c
@@ -928,7 +928,7 @@ ssize_t git_config_ssize_t(const char *name, const char *value)
 	return ret;
 }
 
-int git_parse_maybe_bool(const char *value)
+static int git_parse_maybe_bool_text(const char *value)
 {
 	if (!value)
 		return 1;
@@ -945,9 +945,9 @@ int git_parse_maybe_bool(const char *value)
 	return -1;
 }
 
-int git_config_maybe_bool(const char *name, const char *value)
+int git_parse_maybe_bool(const char *value)
 {
-	int v = git_parse_maybe_bool(value);
+	int v = git_parse_maybe_bool_text(value);
 	if (0 <= v)
 		return v;
 	if (git_parse_int(value, &v))
@@ -957,7 +957,7 @@ int git_config_maybe_bool(const char *name, const char *value)
 
 int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 {
-	int v = git_parse_maybe_bool(value);
+	int v = git_parse_maybe_bool_text(value);
 	if (0 <= v) {
 		*is_bool = 1;
 		return v;
@@ -1460,9 +1460,9 @@ int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_typ
 	return do_config_from(&top, fn, data);
 }
 
-int git_config_from_blob_sha1(config_fn_t fn,
+int git_config_from_blob_oid(config_fn_t fn,
 			      const char *name,
-			      const unsigned char *sha1,
+			      const struct object_id *oid,
 			      void *data)
 {
 	enum object_type type;
@@ -1470,7 +1470,7 @@ int git_config_from_blob_sha1(config_fn_t fn,
 	unsigned long size;
 	int ret;
 
-	buf = read_sha1_file(sha1, &type, &size);
+	buf = read_sha1_file(oid->hash, &type, &size);
 	if (!buf)
 		return error("unable to load config blob object '%s'", name);
 	if (type != OBJ_BLOB) {
@@ -1488,11 +1488,11 @@ static int git_config_from_blob_ref(config_fn_t fn,
 				    const char *name,
 				    void *data)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 
-	if (get_sha1(name, sha1) < 0)
+	if (get_oid(name, &oid) < 0)
 		return error("unable to resolve config blob '%s'", name);
-	return git_config_from_blob_sha1(fn, name, sha1, data);
+	return git_config_from_blob_oid(fn, name, &oid, data);
 }
 
 const char *git_etc_gitconfig(void)
@@ -1715,17 +1715,19 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 }
 
 static int config_set_element_cmp(const void *unused_cmp_data,
-				  const struct config_set_element *e1,
-				  const struct config_set_element *e2,
+				  const void *entry,
+				  const void *entry_or_key,
 				  const void *unused_keydata)
 {
+	const struct config_set_element *e1 = entry;
+	const struct config_set_element *e2 = entry_or_key;
+
 	return strcmp(e1->key, e2->key);
 }
 
 void git_configset_init(struct config_set *cs)
 {
-	hashmap_init(&cs->config_hash, (hashmap_cmp_fn)config_set_element_cmp,
-		     NULL, 0);
+	hashmap_init(&cs->config_hash, config_set_element_cmp, NULL, 0);
 	cs->hash_initialized = 1;
 	cs->list.nr = 0;
 	cs->list.alloc = 0;
@@ -1846,7 +1848,7 @@ int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *de
 {
 	const char *value;
 	if (!git_configset_get_value(cs, key, &value)) {
-		*dest = git_config_maybe_bool(key, value);
+		*dest = git_parse_maybe_bool(value);
 		if (*dest == -1)
 			return -1;
 		return 0;
@@ -2053,6 +2055,23 @@ int git_config_get_pathname(const char *key, const char **dest)
 	return repo_config_get_pathname(the_repository, key, dest);
 }
 
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+void config_from_gitmodules(config_fn_t fn, void *data)
+{
+	if (the_repository->worktree) {
+		char *file = repo_worktree_path(the_repository, GITMODULES_FILE);
+		git_config_from_file(fn, file, data);
+		free(file);
+	}
+}
+
 int git_config_get_expiry(const char *key, const char **output)
 {
 	int ret = git_config_get_string_const(key, output);
@@ -2066,6 +2085,28 @@ int git_config_get_expiry(const char *key, const char **output)
 	return ret;
 }
 
+int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now)
+{
+	char *expiry_string;
+	intmax_t days;
+	timestamp_t when;
+
+	if (git_config_get_string(key, &expiry_string))
+		return 1; /* no such thing */
+
+	if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {
+		const int scale = 86400;
+		*expiry = now - days * scale;
+		return 0;
+	}
+
+	if (!parse_expiry_date(expiry_string, &when)) {
+		*expiry = when;
+		return 0;
+	}
+	return -1; /* thing exists but cannot be parsed */
+}
+
 int git_config_get_untracked_cache(void)
 {
 	int val = -1;
@@ -2155,7 +2196,7 @@ static struct {
 	size_t *offset;
 	unsigned int offset_alloc;
 	enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
-	int seen;
+	unsigned int seen;
 } store;
 
 static int matches(const char *key, const char *value)
@@ -2247,10 +2288,10 @@ static int write_error(const char *filename)
 	return 4;
 }
 
-static int store_write_section(int fd, const char *key)
+static struct strbuf store_create_section(const char *key)
 {
 	const char *dot;
-	int i, success;
+	int i;
 	struct strbuf sb = STRBUF_INIT;
 
 	dot = memchr(key, '.', store.baselen);
@@ -2266,15 +2307,24 @@ static int store_write_section(int fd, const char *key)
 		strbuf_addf(&sb, "[%.*s]\n", store.baselen, key);
 	}
 
-	success = write_in_full(fd, sb.buf, sb.len) == sb.len;
+	return sb;
+}
+
+static ssize_t write_section(int fd, const char *key)
+{
+	struct strbuf sb = store_create_section(key);
+	ssize_t ret;
+
+	ret = write_in_full(fd, sb.buf, sb.len) == sb.len;
 	strbuf_release(&sb);
 
-	return success;
+	return ret;
 }
 
-static int store_write_pair(int fd, const char *key, const char *value)
+static ssize_t write_pair(int fd, const char *key, const char *value)
 {
-	int i, success;
+	int i;
+	ssize_t ret;
 	int length = strlen(key + store.baselen + 1);
 	const char *quote = "";
 	struct strbuf sb = STRBUF_INIT;
@@ -2308,16 +2358,17 @@ static int store_write_pair(int fd, const char *key, const char *value)
 		case '"':
 		case '\\':
 			strbuf_addch(&sb, '\\');
+			/* fallthrough */
 		default:
 			strbuf_addch(&sb, value[i]);
 			break;
 		}
 	strbuf_addf(&sb, "%s\n", quote);
 
-	success = write_in_full(fd, sb.buf, sb.len) == sb.len;
+	ret = write_in_full(fd, sb.buf, sb.len);
 	strbuf_release(&sb);
 
-	return success;
+	return ret;
 }
 
 static ssize_t find_beginning_of_line(const char *contents, size_t size,
@@ -2400,7 +2451,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 {
 	int fd = -1, in_fd = -1;
 	int ret;
-	static struct lock_file lock;
+	struct lock_file lock = LOCK_INIT;
 	char *filename_buf = NULL;
 	char *contents = NULL;
 	size_t contents_sz;
@@ -2446,8 +2497,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		}
 
 		store.key = (char *)key;
-		if (!store_write_section(fd, key) ||
-		    !store_write_pair(fd, key, value))
+		if (write_section(fd, key) < 0 ||
+		    write_pair(fd, key, value) < 0)
 			goto write_err_out;
 	} else {
 		struct stat st;
@@ -2557,11 +2608,10 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 			/* write the first part of the config */
 			if (copy_end > copy_begin) {
 				if (write_in_full(fd, contents + copy_begin,
-						  copy_end - copy_begin) <
-				    copy_end - copy_begin)
+						  copy_end - copy_begin) < 0)
 					goto write_err_out;
 				if (new_line &&
-				    write_str_in_full(fd, "\n") != 1)
+				    write_str_in_full(fd, "\n") < 0)
 					goto write_err_out;
 			}
 			copy_begin = store.offset[i];
@@ -2570,18 +2620,17 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		/* write the pair (value == NULL means unset) */
 		if (value != NULL) {
 			if (store.state == START) {
-				if (!store_write_section(fd, key))
+				if (write_section(fd, key) < 0)
 					goto write_err_out;
 			}
-			if (!store_write_pair(fd, key, value))
+			if (write_pair(fd, key, value) < 0)
 				goto write_err_out;
 		}
 
 		/* write the rest of the config */
 		if (copy_begin < contents_sz)
 			if (write_in_full(fd, contents + copy_begin,
-					  contents_sz - copy_begin) <
-			    contents_sz - copy_begin)
+					  contents_sz - copy_begin) < 0)
 				goto write_err_out;
 
 		munmap(contents, contents_sz);
@@ -2697,8 +2746,8 @@ static int section_name_is_ok(const char *name)
 }
 
 /* if new_name == NULL, the section is removed instead */
-int git_config_rename_section_in_file(const char *config_filename,
-				      const char *old_name, const char *new_name)
+static int git_config_copy_or_rename_section_in_file(const char *config_filename,
+				      const char *old_name, const char *new_name, int copy)
 {
 	int ret = 0, remove = 0;
 	char *filename_buf = NULL;
@@ -2707,6 +2756,7 @@ int git_config_rename_section_in_file(const char *config_filename,
 	char buf[1024];
 	FILE *config_file = NULL;
 	struct stat st;
+	struct strbuf copystr = STRBUF_INIT;
 
 	if (new_name && !section_name_is_ok(new_name)) {
 		ret = error("invalid section name: %s", new_name);
@@ -2745,12 +2795,30 @@ int git_config_rename_section_in_file(const char *config_filename,
 	while (fgets(buf, sizeof(buf), config_file)) {
 		int i;
 		int length;
+		int is_section = 0;
 		char *output = buf;
 		for (i = 0; buf[i] && isspace(buf[i]); i++)
 			; /* do nothing */
 		if (buf[i] == '[') {
 			/* it's a section */
-			int offset = section_name_match(&buf[i], old_name);
+			int offset;
+			is_section = 1;
+
+			/*
+			 * When encountering a new section under -c we
+			 * need to flush out any section we're already
+			 * coping and begin anew. There might be
+			 * multiple [branch "$name"] sections.
+			 */
+			if (copystr.len > 0) {
+				if (write_in_full(out_fd, copystr.buf, copystr.len) != copystr.len) {
+					ret = write_error(get_lock_file_path(lock));
+					goto out;
+				}
+				strbuf_reset(&copystr);
+			}
+
+			offset = section_name_match(&buf[i], old_name);
 			if (offset > 0) {
 				ret++;
 				if (new_name == NULL) {
@@ -2758,25 +2826,29 @@ int git_config_rename_section_in_file(const char *config_filename,
 					continue;
 				}
 				store.baselen = strlen(new_name);
-				if (!store_write_section(out_fd, new_name)) {
-					ret = write_error(get_lock_file_path(lock));
-					goto out;
-				}
-				/*
-				 * We wrote out the new section, with
-				 * a newline, now skip the old
-				 * section's length
-				 */
-				output += offset + i;
-				if (strlen(output) > 0) {
+				if (!copy) {
+					if (write_section(out_fd, new_name) < 0) {
+						ret = write_error(get_lock_file_path(lock));
+						goto out;
+					}
 					/*
-					 * More content means there's
-					 * a declaration to put on the
-					 * next line; indent with a
-					 * tab
+					 * We wrote out the new section, with
+					 * a newline, now skip the old
+					 * section's length
 					 */
-					output -= 1;
-					output[0] = '\t';
+					output += offset + i;
+					if (strlen(output) > 0) {
+						/*
+						 * More content means there's
+						 * a declaration to put on the
+						 * next line; indent with a
+						 * tab
+						 */
+						output -= 1;
+						output[0] = '\t';
+					}
+				} else {
+					copystr = store_create_section(new_name);
 				}
 			}
 			remove = 0;
@@ -2784,11 +2856,30 @@ int git_config_rename_section_in_file(const char *config_filename,
 		if (remove)
 			continue;
 		length = strlen(output);
-		if (write_in_full(out_fd, output, length) != length) {
+
+		if (!is_section && copystr.len > 0) {
+			strbuf_add(&copystr, output, length);
+		}
+
+		if (write_in_full(out_fd, output, length) < 0) {
 			ret = write_error(get_lock_file_path(lock));
 			goto out;
 		}
 	}
+
+	/*
+	 * Copy a trailing section at the end of the config, won't be
+	 * flushed by the usual "flush because we have a new section
+	 * logic in the loop above.
+	 */
+	if (copystr.len > 0) {
+		if (write_in_full(out_fd, copystr.buf, copystr.len) != copystr.len) {
+			ret = write_error(get_lock_file_path(lock));
+			goto out;
+		}
+		strbuf_reset(&copystr);
+	}
+
 	fclose(config_file);
 	config_file = NULL;
 commit_and_out:
@@ -2804,11 +2895,30 @@ out_no_rollback:
 	return ret;
 }
 
+int git_config_rename_section_in_file(const char *config_filename,
+				      const char *old_name, const char *new_name)
+{
+	return git_config_copy_or_rename_section_in_file(config_filename,
+					 old_name, new_name, 0);
+}
+
 int git_config_rename_section(const char *old_name, const char *new_name)
 {
 	return git_config_rename_section_in_file(NULL, old_name, new_name);
 }
 
+int git_config_copy_section_in_file(const char *config_filename,
+				      const char *old_name, const char *new_name)
+{
+	return git_config_copy_or_rename_section_in_file(config_filename,
+					 old_name, new_name, 1);
+}
+
+int git_config_copy_section(const char *old_name, const char *new_name)
+{
+	return git_config_copy_section_in_file(NULL, old_name, new_name);
+}
+
 /*
  * Call this to report error for your variable that should not
  * get a boolean value (i.e. "[my] var" means "true").
diff --git a/config.h b/config.h
index 0352da117..a49d26441 100644
--- a/config.h
+++ b/config.h
@@ -39,8 +39,8 @@ extern int git_default_config(const char *, const char *, void *);
 extern int git_config_from_file(config_fn_t fn, const char *, void *);
 extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
 					const char *name, const char *buf, size_t len, void *data);
-extern int git_config_from_blob_sha1(config_fn_t fn, const char *name,
-				     const unsigned char *sha1, void *data);
+extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
+				    const struct object_id *oid, void *data);
 extern void git_config_push_parameter(const char *text);
 extern int git_config_from_parameters(config_fn_t fn, void *data);
 extern void read_early_config(config_fn_t cb, void *data);
@@ -56,7 +56,6 @@ extern unsigned long git_config_ulong(const char *, const char *);
 extern ssize_t git_config_ssize_t(const char *, const char *);
 extern int git_config_bool_or_int(const char *, const char *, int *);
 extern int git_config_bool(const char *, const char *);
-extern int git_config_maybe_bool(const char *, const char *);
 extern int git_config_string(const char **, const char *, const char *);
 extern int git_config_pathname(const char **, const char *, const char *);
 extern int git_config_set_in_file_gently(const char *, const char *, const char *);
@@ -71,6 +70,8 @@ extern int git_config_set_multivar_in_file_gently(const char *, const char *, co
 extern void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
 extern int git_config_rename_section(const char *, const char *);
 extern int git_config_rename_section_in_file(const char *, const char *, const char *);
+extern int git_config_copy_section(const char *, const char *);
+extern int git_config_copy_section_in_file(const char *, const char *, const char *);
 extern const char *git_etc_gitconfig(void);
 extern int git_env_bool(const char *, int);
 extern unsigned long git_env_ulong(const char *, unsigned long);
@@ -187,6 +188,16 @@ extern int repo_config_get_maybe_bool(struct repository *repo,
 extern int repo_config_get_pathname(struct repository *repo,
 				    const char *key, const char **dest);
 
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+extern void config_from_gitmodules(config_fn_t fn, void *data);
+
 extern int git_config_get_value(const char *key, const char **value);
 extern const struct string_list *git_config_get_value_multi(const char *key);
 extern void git_config_clear(void);
@@ -205,6 +216,9 @@ extern int git_config_get_max_percent_split_change(void);
 /* This dies if the configured or default date is in the future */
 extern int git_config_get_expiry(const char *key, const char **output);
 
+/* parse either "this many days" integer, or "5.days.ago" approxidate */
+extern int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
+
 struct key_value_info {
 	const char *filename;
 	int linenr;
diff --git a/config.mak.uname b/config.mak.uname
index 6604b130f..685a80d13 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -184,6 +184,7 @@ ifeq ($(uname_O),Cygwin)
 	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
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 endif
@@ -353,6 +354,7 @@ ifeq ($(uname_S),Windows)
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	NO_NSEC = YesPlease
 	USE_WIN32_MMAP = YesPlease
+	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	# USE_NED_ALLOCATOR = YesPlease
 	UNRELIABLE_FSTAT = UnfortunatelyYes
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
@@ -501,6 +503,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	NO_NSEC = YesPlease
 	USE_WIN32_MMAP = YesPlease
+	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	USE_NED_ALLOCATOR = YesPlease
 	UNRELIABLE_FSTAT = UnfortunatelyYes
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
diff --git a/connect.c b/connect.c
index 49b28b83b..df56c0cbf 100644
--- a/connect.c
+++ b/connect.c
@@ -778,7 +778,6 @@ struct child_process *git_connect(int fd[2], const char *url,
 	char *hostandport, *path;
 	struct child_process *conn = &no_fork;
 	enum protocol protocol;
-	struct strbuf cmd = STRBUF_INIT;
 
 	/* Without this we cannot rely on waitpid() to tell
 	 * what happened to our children.
@@ -826,6 +825,8 @@ struct child_process *git_connect(int fd[2], const char *url,
 			     target_host, 0);
 		free(target_host);
 	} else {
+		struct strbuf cmd = STRBUF_INIT;
+
 		conn = xmalloc(sizeof(*conn));
 		child_process_init(conn);
 
@@ -862,6 +863,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 				free(hostandport);
 				free(path);
 				free(conn);
+				strbuf_release(&cmd);
 				return NULL;
 			}
 
diff --git a/connected.c b/connected.c
index 136c2ac16..f416b0505 100644
--- a/connected.c
+++ b/connected.c
@@ -3,6 +3,7 @@
 #include "sigchain.h"
 #include "connected.h"
 #include "transport.h"
+#include "packfile.h"
 
 /*
  * If we feed all the commits we want to verify to this command
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index dbe2abf27..85ad732fc 100755
--- a/contrib/contacts/git-contacts
+++ b/contrib/contacts/git-contacts
@@ -11,7 +11,7 @@ use IPC::Open2;
 
 my $since = '5-years-ago';
 my $min_percent = 10;
-my $labels_rx = qr/Signed-off-by|Reviewed-by|Acked-by|Cc/i;
+my $labels_rx = qr/Signed-off-by|Reviewed-by|Acked-by|Cc|Reported-by/i;
 my %seen;
 
 sub format_contact {
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index ee99f1a4e..932e78dbf 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -399,7 +399,7 @@ case "$allow_fast_forward,$#,$common,$no_commit" in
 ?,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."
+	finish_up_to_date "Already up to date."
 	exit 0
 	;;
 t,1,"$head",*)
@@ -459,7 +459,7 @@ t,1,"$head",*)
 	done
 	if test "$up_to_date" = t
 	then
-		finish_up_to_date "Already up-to-date. Yeeah!"
+		finish_up_to_date "Already up to date. Yeeah!"
 		exit 0
 	fi
 	;;
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 70fdc27b7..3099dc851 100755
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -41,7 +41,7 @@ fi
 
 case "$common" in
 "$merge")
-	echo "Already up-to-date. Yeeah!"
+	echo "Already up to date. Yeeah!"
 	dropheads
 	exit 0
 	;;
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 52ad9e41f..eeee45dd3 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -3,10 +3,56 @@
 # Prime rerere database from existing merge commits
 
 me=rerere-train
-USAGE="$me rev-list-args"
+USAGE=$(cat <<-EOF
+usage: $me [--overwrite] <rev-list-args>
+
+    -h, --help            show the help
+    -o, --overwrite       overwrite any existing rerere cache
+EOF
+)
 
 SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
+
+overwrite=0
+
+while test $# -gt 0
+do
+	opt="$1"
+	case "$opt" in
+	-h|--help)
+		echo "$USAGE"
+		exit 0
+		;;
+	-o|--overwrite)
+		overwrite=1
+		shift
+		break
+		;;
+	--)
+		shift
+		break
+		;;
+	*)
+		break
+		;;
+	esac
+done
+
+# Overwrite or help options are not valid except as first arg
+for opt in "$@"
+do
+	case "$opt" in
+	-h|--help)
+		echo "$USAGE"
+		exit 0
+		;;
+	-o|--overwrite)
+		echo "$USAGE"
+		exit 0
+		;;
+	esac
+done
+
 . "$(git --exec-path)/git-sh-setup"
 require_work_tree
 cd_to_toplevel
@@ -34,6 +80,10 @@ do
 		# Cleanly merges
 		continue
 	fi
+	if test $overwrite = 1
+	then
+		git rerere forget .
+	fi
 	if test -s "$GIT_DIR/MERGE_RR"
 	then
 		git show -s --pretty=format:"Learning from %h %s" "$commit"
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 3c87ebaf5..d05c613c9 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -253,7 +253,7 @@ test_expect_success 'merge the added subproj again, should do nothing' '
 		# this shouldn not actually do anything, since FETCH_HEAD
 		# is already a parent
 		result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
-		check_equal "${result}" "Already up-to-date."
+		check_equal "${result}" "Already up to date."
 	)
 '
 
diff --git a/convert.c b/convert.c
index 387c1c545..20d7ab67b 100644
--- a/convert.c
+++ b/convert.c
@@ -423,8 +423,10 @@ static int filter_buffer_or_fd(int in, int out, void *data)
 	child_process.in = -1;
 	child_process.out = out;
 
-	if (start_command(&child_process))
+	if (start_command(&child_process)) {
+		strbuf_release(&cmd);
 		return error("cannot fork to run external filter '%s'", params->cmd);
+	}
 
 	sigchain_push(SIGPIPE, SIG_IGN);
 
@@ -564,8 +566,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 
 	if (!subprocess_map_initialized) {
 		subprocess_map_initialized = 1;
-		hashmap_init(&subprocess_map, (hashmap_cmp_fn) cmd2process_cmp,
-			     NULL, 0);
+		hashmap_init(&subprocess_map, cmd2process_cmp, NULL, 0);
 		entry = NULL;
 	} else {
 		entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);
@@ -1041,7 +1042,6 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
 		ca->crlf_action = git_path_check_crlf(ccheck + 4);
 		if (ca->crlf_action == CRLF_UNDEFINED)
 			ca->crlf_action = git_path_check_crlf(ccheck + 0);
-		ca->attr_action = ca->crlf_action;
 		ca->ident = git_path_check_ident(ccheck + 1);
 		ca->drv = git_path_check_convert(ccheck + 2);
 		if (ca->crlf_action != CRLF_BINARY) {
@@ -1055,12 +1055,14 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
 			else if (eol_attr == EOL_CRLF)
 				ca->crlf_action = CRLF_TEXT_CRLF;
 		}
-		ca->attr_action = ca->crlf_action;
 	} else {
 		ca->drv = NULL;
 		ca->crlf_action = CRLF_UNDEFINED;
 		ca->ident = 0;
 	}
+
+	/* Save attr and make a decision for action */
+	ca->attr_action = ca->crlf_action;
 	if (ca->crlf_action == CRLF_TEXT)
 		ca->crlf_action = text_eol_is_crlf() ? CRLF_TEXT_CRLF : CRLF_TEXT_INPUT;
 	if (ca->crlf_action == CRLF_UNDEFINED && auto_crlf == AUTO_CRLF_FALSE)
@@ -1543,8 +1545,9 @@ static int ident_filter_fn(struct stream_filter *filter,
 		switch (ident->state) {
 		default:
 			strbuf_add(&ident->left, head, ident->state);
+			/* fallthrough */
 		case IDENT_SKIPPING:
-			/* fallthru */
+			/* fallthrough */
 		case IDENT_DRAINING:
 			ident_drain(ident, &output, osize_p);
 		}
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 0d5c62509..4dfbc8c9f 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -5,8 +5,6 @@
 #include "unix-socket.h"
 #include "parse-options.h"
 
-static struct tempfile socket_file;
-
 struct credential_cache_entry {
 	struct credential item;
 	timestamp_t expiration;
@@ -260,6 +258,7 @@ static void init_socket_directory(const char *path)
 
 int cmd_main(int argc, const char **argv)
 {
+	struct tempfile *socket_file;
 	const char *socket_path;
 	int ignore_sighup = 0;
 	static const char *usage[] = {
@@ -285,7 +284,7 @@ int cmd_main(int argc, const char **argv)
 		die("socket directory must be an absolute path");
 
 	init_socket_directory(socket_path);
-	register_tempfile(&socket_file, socket_path);
+	socket_file = register_tempfile(socket_path);
 
 	if (ignore_sighup)
 		signal(SIGHUP, SIG_IGN);
diff --git a/csum-file.c b/csum-file.c
index a172199e4..2adae0407 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -19,7 +19,7 @@ static void flush(struct sha1file *f, const void *buf, unsigned int count)
 
 		if (ret < 0)
 			die_errno("%s: sha1 file read error", f->name);
-		if (ret < count)
+		if (ret != count)
 			die("%s: sha1 file truncated", f->name);
 		if (memcmp(buf, check_buffer, count))
 			die("sha1 file '%s' validation error", f->name);
diff --git a/diff-delta.c b/diff-delta.c
index 3797ce604..e49643353 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -319,7 +319,9 @@ create_delta(const struct delta_index *index,
 	     const void *trg_buf, unsigned long trg_size,
 	     unsigned long *delta_size, unsigned long max_size)
 {
-	unsigned int i, outpos, outsize, moff, msize, val;
+	unsigned int i, val;
+	off_t outpos, moff;
+	size_t l, outsize, msize;
 	int inscnt;
 	const unsigned char *ref_data, *ref_top, *data, *top;
 	unsigned char *out;
@@ -336,20 +338,20 @@ create_delta(const struct delta_index *index,
 		return NULL;
 
 	/* store reference buffer size */
-	i = index->src_size;
-	while (i >= 0x80) {
-		out[outpos++] = i | 0x80;
-		i >>= 7;
+	l = index->src_size;
+	while (l >= 0x80) {
+		out[outpos++] = l | 0x80;
+		l >>= 7;
 	}
-	out[outpos++] = i;
+	out[outpos++] = l;
 
 	/* store target buffer size */
-	i = trg_size;
-	while (i >= 0x80) {
-		out[outpos++] = i | 0x80;
-		i >>= 7;
+	l = trg_size;
+	while (l >= 0x80) {
+		out[outpos++] = l | 0x80;
+		l >>= 7;
 	}
-	out[outpos++] = i;
+	out[outpos++] = l;
 
 	ref_data = index->src_buf;
 	ref_top = ref_data + index->src_size;
@@ -452,6 +454,9 @@ create_delta(const struct delta_index *index,
 			moff += msize;
 			msize = left;
 
+			if (moff > 0xffffffff)
+				msize = 0;
+
 			if (msize < 4096) {
 				int j;
 				val = 0;
diff --git a/diff-lib.c b/diff-lib.c
index 2a52b0795..4e0980caa 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -549,7 +549,6 @@ int index_differs_from(const char *def, int diff_flags,
 	rev.diffopt.flags |= diff_flags;
 	rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
 	run_diff_index(&rev, 1);
-	if (rev.pending.alloc)
-		free(rev.pending.objects);
+	object_array_clear(&rev.pending);
 	return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
 }
diff --git a/diff.c b/diff.c
index 85e714f6c..6fd288420 100644
--- a/diff.c
+++ b/diff.c
@@ -16,10 +16,12 @@
 #include "userdiff.h"
 #include "submodule-config.h"
 #include "submodule.h"
+#include "hashmap.h"
 #include "ll-merge.h"
 #include "string-list.h"
 #include "argv-array.h"
 #include "graph.h"
+#include "packfile.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
@@ -32,6 +34,7 @@ static int diff_indent_heuristic = 1;
 static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;
+static int diff_color_moved_default;
 static int diff_context_default = 3;
 static int diff_interhunk_context_default;
 static const char *diff_word_regex_cfg;
@@ -56,6 +59,14 @@ static char diff_colors[][COLOR_MAXLEN] = {
 	GIT_COLOR_YELLOW,	/* COMMIT */
 	GIT_COLOR_BG_RED,	/* WHITESPACE */
 	GIT_COLOR_NORMAL,	/* FUNCINFO */
+	GIT_COLOR_BOLD_MAGENTA,	/* OLD_MOVED */
+	GIT_COLOR_BOLD_BLUE,	/* OLD_MOVED ALTERNATIVE */
+	GIT_COLOR_FAINT,	/* OLD_MOVED_DIM */
+	GIT_COLOR_FAINT_ITALIC,	/* OLD_MOVED_ALTERNATIVE_DIM */
+	GIT_COLOR_BOLD_CYAN,	/* NEW_MOVED */
+	GIT_COLOR_BOLD_YELLOW,	/* NEW_MOVED ALTERNATIVE */
+	GIT_COLOR_FAINT,	/* NEW_MOVED_DIM */
+	GIT_COLOR_FAINT_ITALIC,	/* NEW_MOVED_ALTERNATIVE_DIM */
 };
 
 static NORETURN void die_want_option(const char *option_name)
@@ -81,6 +92,22 @@ static int parse_diff_color_slot(const char *var)
 		return DIFF_WHITESPACE;
 	if (!strcasecmp(var, "func"))
 		return DIFF_FUNCINFO;
+	if (!strcasecmp(var, "oldmoved"))
+		return DIFF_FILE_OLD_MOVED;
+	if (!strcasecmp(var, "oldmovedalternative"))
+		return DIFF_FILE_OLD_MOVED_ALT;
+	if (!strcasecmp(var, "oldmoveddimmed"))
+		return DIFF_FILE_OLD_MOVED_DIM;
+	if (!strcasecmp(var, "oldmovedalternativedimmed"))
+		return DIFF_FILE_OLD_MOVED_ALT_DIM;
+	if (!strcasecmp(var, "newmoved"))
+		return DIFF_FILE_NEW_MOVED;
+	if (!strcasecmp(var, "newmovedalternative"))
+		return DIFF_FILE_NEW_MOVED_ALT;
+	if (!strcasecmp(var, "newmoveddimmed"))
+		return DIFF_FILE_NEW_MOVED_DIM;
+	if (!strcasecmp(var, "newmovedalternativedimmed"))
+		return DIFF_FILE_NEW_MOVED_ALT_DIM;
 	return -1;
 }
 
@@ -229,12 +256,44 @@ int git_diff_heuristic_config(const char *var, const char *value, void *cb)
 	return 0;
 }
 
+static int parse_color_moved(const char *arg)
+{
+	switch (git_parse_maybe_bool(arg)) {
+	case 0:
+		return COLOR_MOVED_NO;
+	case 1:
+		return COLOR_MOVED_DEFAULT;
+	default:
+		break;
+	}
+
+	if (!strcmp(arg, "no"))
+		return COLOR_MOVED_NO;
+	else if (!strcmp(arg, "plain"))
+		return COLOR_MOVED_PLAIN;
+	else if (!strcmp(arg, "zebra"))
+		return COLOR_MOVED_ZEBRA;
+	else if (!strcmp(arg, "default"))
+		return COLOR_MOVED_DEFAULT;
+	else if (!strcmp(arg, "dimmed_zebra"))
+		return COLOR_MOVED_ZEBRA_DIM;
+	else
+		return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"));
+}
+
 int git_diff_ui_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
 		diff_use_color_default = git_config_colorbool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "diff.colormoved")) {
+		int cm = parse_color_moved(value);
+		if (cm < 0)
+			return -1;
+		diff_color_moved_default = cm;
+		return 0;
+	}
 	if (!strcmp(var, "diff.context")) {
 		diff_context_default = git_config_int(var, value);
 		if (diff_context_default < 0)
@@ -346,9 +405,6 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
-	if (starts_with(var, "submodule."))
-		return parse_submodule_config_option(var, value);
-
 	if (git_diff_heuristic_config(var, value, cb) < 0)
 		return -1;
 
@@ -406,11 +462,9 @@ static struct diff_tempfile {
 	 * If this diff_tempfile instance refers to a temporary file,
 	 * this tempfile object is used to manage its lifetime.
 	 */
-	struct tempfile tempfile;
+	struct tempfile *tempfile;
 } diff_temp[2];
 
-typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
-
 struct emit_callback {
 	int color_diff;
 	unsigned ws_rule;
@@ -418,7 +472,6 @@ struct emit_callback {
 	int blank_at_eof_in_postimage;
 	int lno_in_preimage;
 	int lno_in_postimage;
-	sane_truncate_fn truncate;
 	const char **label_path;
 	struct diff_words_data *diff_words;
 	struct diff_options *opt;
@@ -560,68 +613,737 @@ static void emit_line(struct diff_options *o, const char *set, const char *reset
 	emit_line_0(o, set, reset, line[0], line+1, len-1);
 }
 
-static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
+enum diff_symbol {
+	DIFF_SYMBOL_BINARY_DIFF_HEADER,
+	DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
+	DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
+	DIFF_SYMBOL_BINARY_DIFF_BODY,
+	DIFF_SYMBOL_BINARY_DIFF_FOOTER,
+	DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
+	DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
+	DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
+	DIFF_SYMBOL_STATS_LINE,
+	DIFF_SYMBOL_WORD_DIFF,
+	DIFF_SYMBOL_STAT_SEP,
+	DIFF_SYMBOL_SUMMARY,
+	DIFF_SYMBOL_SUBMODULE_ADD,
+	DIFF_SYMBOL_SUBMODULE_DEL,
+	DIFF_SYMBOL_SUBMODULE_UNTRACKED,
+	DIFF_SYMBOL_SUBMODULE_MODIFIED,
+	DIFF_SYMBOL_SUBMODULE_HEADER,
+	DIFF_SYMBOL_SUBMODULE_ERROR,
+	DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
+	DIFF_SYMBOL_REWRITE_DIFF,
+	DIFF_SYMBOL_BINARY_FILES,
+	DIFF_SYMBOL_HEADER,
+	DIFF_SYMBOL_FILEPAIR_PLUS,
+	DIFF_SYMBOL_FILEPAIR_MINUS,
+	DIFF_SYMBOL_WORDS_PORCELAIN,
+	DIFF_SYMBOL_WORDS,
+	DIFF_SYMBOL_CONTEXT,
+	DIFF_SYMBOL_CONTEXT_INCOMPLETE,
+	DIFF_SYMBOL_PLUS,
+	DIFF_SYMBOL_MINUS,
+	DIFF_SYMBOL_NO_LF_EOF,
+	DIFF_SYMBOL_CONTEXT_FRAGINFO,
+	DIFF_SYMBOL_CONTEXT_MARKER,
+	DIFF_SYMBOL_SEPARATOR
+};
+/*
+ * Flags for content lines:
+ * 0..12 are whitespace rules
+ * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
+ * 16 is marking if the line is blank at EOF
+ */
+#define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF	(1<<16)
+#define DIFF_SYMBOL_MOVED_LINE			(1<<17)
+#define DIFF_SYMBOL_MOVED_LINE_ALT		(1<<18)
+#define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING	(1<<19)
+#define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
+
+/*
+ * This struct is used when we need to buffer the output of the diff output.
+ *
+ * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
+ * into the pre/post image file. This pointer could be a union with the
+ * line pointer. By storing an offset into the file instead of the literal line,
+ * we can decrease the memory footprint for the buffered output. At first we
+ * may want to only have indirection for the content lines, but we could also
+ * enhance the state for emitting prefabricated lines, e.g. the similarity
+ * score line or hunk/file headers would only need to store a number or path
+ * and then the output can be constructed later on depending on state.
+ */
+struct emitted_diff_symbol {
+	const char *line;
+	int len;
+	int flags;
+	enum diff_symbol s;
+};
+#define EMITTED_DIFF_SYMBOL_INIT {NULL}
+
+struct emitted_diff_symbols {
+	struct emitted_diff_symbol *buf;
+	int nr, alloc;
+};
+#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
+
+static void append_emitted_diff_symbol(struct diff_options *o,
+				       struct emitted_diff_symbol *e)
 {
-	if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
-	      ecbdata->blank_at_eof_in_preimage &&
-	      ecbdata->blank_at_eof_in_postimage &&
-	      ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
-	      ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
-		return 0;
-	return ws_blank_line(line, len, ecbdata->ws_rule);
+	struct emitted_diff_symbol *f;
+
+	ALLOC_GROW(o->emitted_symbols->buf,
+		   o->emitted_symbols->nr + 1,
+		   o->emitted_symbols->alloc);
+	f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];
+
+	memcpy(f, e, sizeof(struct emitted_diff_symbol));
+	f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
 }
 
-static void emit_line_checked(const char *reset,
-			      struct emit_callback *ecbdata,
-			      const char *line, int len,
-			      enum color_diff color,
-			      unsigned ws_error_highlight,
-			      char sign)
+struct moved_entry {
+	struct hashmap_entry ent;
+	const struct emitted_diff_symbol *es;
+	struct moved_entry *next_line;
+};
+
+static int next_byte(const char **cp, const char **endp,
+		     const struct diff_options *diffopt)
+{
+	int retval;
+
+	if (*cp > *endp)
+		return -1;
+
+	if (isspace(**cp)) {
+		if (DIFF_XDL_TST(diffopt, IGNORE_WHITESPACE_CHANGE)) {
+			while (*cp < *endp && isspace(**cp))
+				(*cp)++;
+			/*
+			 * After skipping a couple of whitespaces,
+			 * we still have to account for one space.
+			 */
+			return (int)' ';
+		}
+
+		if (DIFF_XDL_TST(diffopt, IGNORE_WHITESPACE)) {
+			while (*cp < *endp && isspace(**cp))
+				(*cp)++;
+			/* return the first non-ws character via the usual below */
+		}
+	}
+
+	retval = (unsigned char)(**cp);
+	(*cp)++;
+	return retval;
+}
+
+static int moved_entry_cmp(const struct diff_options *diffopt,
+			   const struct moved_entry *a,
+			   const struct moved_entry *b,
+			   const void *keydata)
+{
+	const char *ap = a->es->line, *ae = a->es->line + a->es->len;
+	const char *bp = b->es->line, *be = b->es->line + b->es->len;
+
+	if (!(diffopt->xdl_opts & XDF_WHITESPACE_FLAGS))
+		return a->es->len != b->es->len  || memcmp(ap, bp, a->es->len);
+
+	if (DIFF_XDL_TST(diffopt, IGNORE_WHITESPACE_AT_EOL)) {
+		while (ae > ap && isspace(*ae))
+			ae--;
+		while (be > bp && isspace(*be))
+			be--;
+	}
+
+	while (1) {
+		int ca, cb;
+		ca = next_byte(&ap, &ae, diffopt);
+		cb = next_byte(&bp, &be, diffopt);
+		if (ca != cb)
+			return 1;
+		if (ca < 0)
+			return 0;
+	}
+}
+
+static unsigned get_string_hash(struct emitted_diff_symbol *es, struct diff_options *o)
+{
+	if (o->xdl_opts & XDF_WHITESPACE_FLAGS) {
+		static struct strbuf sb = STRBUF_INIT;
+		const char *ap = es->line, *ae = es->line + es->len;
+		int c;
+
+		strbuf_reset(&sb);
+		while (ae > ap && isspace(*ae))
+			ae--;
+		while ((c = next_byte(&ap, &ae, o)) > 0)
+			strbuf_addch(&sb, c);
+
+		return memhash(sb.buf, sb.len);
+	} else {
+		return memhash(es->line, es->len);
+	}
+}
+
+static struct moved_entry *prepare_entry(struct diff_options *o,
+					 int line_no)
+{
+	struct moved_entry *ret = xmalloc(sizeof(*ret));
+	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
+
+	ret->ent.hash = get_string_hash(l, o);
+	ret->es = l;
+	ret->next_line = NULL;
+
+	return ret;
+}
+
+static void add_lines_to_move_detection(struct diff_options *o,
+					struct hashmap *add_lines,
+					struct hashmap *del_lines)
+{
+	struct moved_entry *prev_line = NULL;
+
+	int n;
+	for (n = 0; n < o->emitted_symbols->nr; n++) {
+		struct hashmap *hm;
+		struct moved_entry *key;
+
+		switch (o->emitted_symbols->buf[n].s) {
+		case DIFF_SYMBOL_PLUS:
+			hm = add_lines;
+			break;
+		case DIFF_SYMBOL_MINUS:
+			hm = del_lines;
+			break;
+		default:
+			prev_line = NULL;
+			continue;
+		}
+
+		key = prepare_entry(o, n);
+		if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
+			prev_line->next_line = key;
+
+		hashmap_add(hm, key);
+		prev_line = key;
+	}
+}
+
+static int shrink_potential_moved_blocks(struct moved_entry **pmb,
+					 int pmb_nr)
+{
+	int lp, rp;
+
+	/* Shrink the set of potential block to the remaining running */
+	for (lp = 0, rp = pmb_nr - 1; lp <= rp;) {
+		while (lp < pmb_nr && pmb[lp])
+			lp++;
+		/* lp points at the first NULL now */
+
+		while (rp > -1 && !pmb[rp])
+			rp--;
+		/* rp points at the last non-NULL */
+
+		if (lp < pmb_nr && rp > -1 && lp < rp) {
+			pmb[lp] = pmb[rp];
+			pmb[rp] = NULL;
+			rp--;
+			lp++;
+		}
+	}
+
+	/* Remember the number of running sets */
+	return rp + 1;
+}
+
+/*
+ * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
+ *
+ * Otherwise, if the last block has fewer alphanumeric characters than
+ * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
+ * that block.
+ *
+ * The last block consists of the (n - block_length)'th line up to but not
+ * including the nth line.
+ *
+ * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
+ * Think of a way to unify them.
+ */
+static void adjust_last_block(struct diff_options *o, int n, int block_length)
+{
+	int i, alnum_count = 0;
+	if (o->color_moved == COLOR_MOVED_PLAIN)
+		return;
+	for (i = 1; i < block_length + 1; i++) {
+		const char *c = o->emitted_symbols->buf[n - i].line;
+		for (; *c; c++) {
+			if (!isalnum(*c))
+				continue;
+			alnum_count++;
+			if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
+				return;
+		}
+	}
+	for (i = 1; i < block_length + 1; i++)
+		o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
+}
+
+/* Find blocks of moved code, delegate actual coloring decision to helper */
+static void mark_color_as_moved(struct diff_options *o,
+				struct hashmap *add_lines,
+				struct hashmap *del_lines)
+{
+	struct moved_entry **pmb = NULL; /* potentially moved blocks */
+	int pmb_nr = 0, pmb_alloc = 0;
+	int n, flipped_block = 1, block_length = 0;
+
+
+	for (n = 0; n < o->emitted_symbols->nr; n++) {
+		struct hashmap *hm = NULL;
+		struct moved_entry *key;
+		struct moved_entry *match = NULL;
+		struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
+		int i;
+
+		switch (l->s) {
+		case DIFF_SYMBOL_PLUS:
+			hm = del_lines;
+			key = prepare_entry(o, n);
+			match = hashmap_get(hm, key, o);
+			free(key);
+			break;
+		case DIFF_SYMBOL_MINUS:
+			hm = add_lines;
+			key = prepare_entry(o, n);
+			match = hashmap_get(hm, key, o);
+			free(key);
+			break;
+		default:
+			flipped_block = 1;
+		}
+
+		if (!match) {
+			adjust_last_block(o, n, block_length);
+			pmb_nr = 0;
+			block_length = 0;
+			continue;
+		}
+
+		l->flags |= DIFF_SYMBOL_MOVED_LINE;
+
+		if (o->color_moved == COLOR_MOVED_PLAIN)
+			continue;
+
+		/* Check any potential block runs, advance each or nullify */
+		for (i = 0; i < pmb_nr; i++) {
+			struct moved_entry *p = pmb[i];
+			struct moved_entry *pnext = (p && p->next_line) ?
+					p->next_line : NULL;
+			if (pnext && !hm->cmpfn(o, pnext, match, NULL)) {
+				pmb[i] = p->next_line;
+			} else {
+				pmb[i] = NULL;
+			}
+		}
+
+		pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
+
+		if (pmb_nr == 0) {
+			/*
+			 * The current line is the start of a new block.
+			 * Setup the set of potential blocks.
+			 */
+			for (; match; match = hashmap_get_next(hm, match)) {
+				ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
+				pmb[pmb_nr++] = match;
+			}
+
+			flipped_block = (flipped_block + 1) % 2;
+
+			adjust_last_block(o, n, block_length);
+			block_length = 0;
+		}
+
+		block_length++;
+
+		if (flipped_block)
+			l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
+	}
+	adjust_last_block(o, n, block_length);
+
+	free(pmb);
+}
+
+#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
+  (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
+static void dim_moved_lines(struct diff_options *o)
+{
+	int n;
+	for (n = 0; n < o->emitted_symbols->nr; n++) {
+		struct emitted_diff_symbol *prev = (n != 0) ?
+				&o->emitted_symbols->buf[n - 1] : NULL;
+		struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
+		struct emitted_diff_symbol *next =
+				(n < o->emitted_symbols->nr - 1) ?
+				&o->emitted_symbols->buf[n + 1] : NULL;
+
+		/* Not a plus or minus line? */
+		if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
+			continue;
+
+		/* Not a moved line? */
+		if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
+			continue;
+
+		/*
+		 * If prev or next are not a plus or minus line,
+		 * pretend they don't exist
+		 */
+		if (prev && prev->s != DIFF_SYMBOL_PLUS &&
+			    prev->s != DIFF_SYMBOL_MINUS)
+			prev = NULL;
+		if (next && next->s != DIFF_SYMBOL_PLUS &&
+			    next->s != DIFF_SYMBOL_MINUS)
+			next = NULL;
+
+		/* Inside a block? */
+		if ((prev &&
+		    (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
+		    (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
+		    (next &&
+		    (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
+		    (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
+			l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
+			continue;
+		}
+
+		/* Check if we are at an interesting bound: */
+		if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
+		    (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
+		       (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
+			continue;
+		if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
+		    (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
+		       (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
+			continue;
+
+		/*
+		 * The boundary to prev and next are not interesting,
+		 * so this line is not interesting as a whole
+		 */
+		l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
+	}
+}
+
+static void emit_line_ws_markup(struct diff_options *o,
+				const char *set, const char *reset,
+				const char *line, int len, char sign,
+				unsigned ws_rule, int blank_at_eof)
 {
-	const char *set = diff_get_color(ecbdata->color_diff, color);
 	const char *ws = NULL;
 
-	if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
-		ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
+	if (o->ws_error_highlight & ws_rule) {
+		ws = diff_get_color_opt(o, DIFF_WHITESPACE);
 		if (!*ws)
 			ws = NULL;
 	}
 
 	if (!ws)
-		emit_line_0(ecbdata->opt, set, reset, sign, line, len);
-	else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
+		emit_line_0(o, set, reset, sign, line, len);
+	else if (blank_at_eof)
 		/* Blank line at EOF - paint '+' as well */
-		emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
+		emit_line_0(o, ws, reset, sign, line, len);
 	else {
 		/* Emit just the prefix, then the rest. */
-		emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
-		ws_check_emit(line, len, ecbdata->ws_rule,
-			      ecbdata->opt->file, set, reset, ws);
+		emit_line_0(o, set, reset, sign, "", 0);
+		ws_check_emit(line, len, ws_rule,
+			      o->file, set, reset, ws);
+	}
+}
+
+static void emit_diff_symbol_from_struct(struct diff_options *o,
+					 struct emitted_diff_symbol *eds)
+{
+	static const char *nneof = " No newline at end of file\n";
+	const char *context, *reset, *set, *meta, *fraginfo;
+	struct strbuf sb = STRBUF_INIT;
+
+	enum diff_symbol s = eds->s;
+	const char *line = eds->line;
+	int len = eds->len;
+	unsigned flags = eds->flags;
+
+	switch (s) {
+	case DIFF_SYMBOL_NO_LF_EOF:
+		context = diff_get_color_opt(o, DIFF_CONTEXT);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		putc('\n', o->file);
+		emit_line_0(o, context, reset, '\\',
+			    nneof, strlen(nneof));
+		break;
+	case DIFF_SYMBOL_SUBMODULE_HEADER:
+	case DIFF_SYMBOL_SUBMODULE_ERROR:
+	case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
+	case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
+	case DIFF_SYMBOL_SUMMARY:
+	case DIFF_SYMBOL_STATS_LINE:
+	case DIFF_SYMBOL_BINARY_DIFF_BODY:
+	case DIFF_SYMBOL_CONTEXT_FRAGINFO:
+		emit_line(o, "", "", line, len);
+		break;
+	case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
+	case DIFF_SYMBOL_CONTEXT_MARKER:
+		context = diff_get_color_opt(o, DIFF_CONTEXT);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line(o, context, reset, line, len);
+		break;
+	case DIFF_SYMBOL_SEPARATOR:
+		fprintf(o->file, "%s%c",
+			diff_line_prefix(o),
+			o->line_termination);
+		break;
+	case DIFF_SYMBOL_CONTEXT:
+		set = diff_get_color_opt(o, DIFF_CONTEXT);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line_ws_markup(o, set, reset, line, len, ' ',
+				    flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
+		break;
+	case DIFF_SYMBOL_PLUS:
+		switch (flags & (DIFF_SYMBOL_MOVED_LINE |
+				 DIFF_SYMBOL_MOVED_LINE_ALT |
+				 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_ALT |
+		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_ALT:
+			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE:
+			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
+			break;
+		default:
+			set = diff_get_color_opt(o, DIFF_FILE_NEW);
+		}
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line_ws_markup(o, set, reset, line, len, '+',
+				    flags & DIFF_SYMBOL_CONTENT_WS_MASK,
+				    flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
+		break;
+	case DIFF_SYMBOL_MINUS:
+		switch (flags & (DIFF_SYMBOL_MOVED_LINE |
+				 DIFF_SYMBOL_MOVED_LINE_ALT |
+				 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_ALT |
+		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_ALT:
+			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE |
+		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
+			break;
+		case DIFF_SYMBOL_MOVED_LINE:
+			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
+			break;
+		default:
+			set = diff_get_color_opt(o, DIFF_FILE_OLD);
+		}
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line_ws_markup(o, set, reset, line, len, '-',
+				    flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
+		break;
+	case DIFF_SYMBOL_WORDS_PORCELAIN:
+		context = diff_get_color_opt(o, DIFF_CONTEXT);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line(o, context, reset, line, len);
+		fputs("~\n", o->file);
+		break;
+	case DIFF_SYMBOL_WORDS:
+		context = diff_get_color_opt(o, DIFF_CONTEXT);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		/*
+		 * Skip the prefix character, if any.  With
+		 * diff_suppress_blank_empty, there may be
+		 * none.
+		 */
+		if (line[0] != '\n') {
+			line++;
+			len--;
+		}
+		emit_line(o, context, reset, line, len);
+		break;
+	case DIFF_SYMBOL_FILEPAIR_PLUS:
+		meta = diff_get_color_opt(o, DIFF_METAINFO);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
+			line, reset,
+			strchr(line, ' ') ? "\t" : "");
+		break;
+	case DIFF_SYMBOL_FILEPAIR_MINUS:
+		meta = diff_get_color_opt(o, DIFF_METAINFO);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
+			line, reset,
+			strchr(line, ' ') ? "\t" : "");
+		break;
+	case DIFF_SYMBOL_BINARY_FILES:
+	case DIFF_SYMBOL_HEADER:
+		fprintf(o->file, "%s", line);
+		break;
+	case DIFF_SYMBOL_BINARY_DIFF_HEADER:
+		fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
+		break;
+	case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
+		fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
+		break;
+	case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
+		fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
+		break;
+	case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
+		fputs(diff_line_prefix(o), o->file);
+		fputc('\n', o->file);
+		break;
+	case DIFF_SYMBOL_REWRITE_DIFF:
+		fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line(o, fraginfo, reset, line, len);
+		break;
+	case DIFF_SYMBOL_SUBMODULE_ADD:
+		set = diff_get_color_opt(o, DIFF_FILE_NEW);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line(o, set, reset, line, len);
+		break;
+	case DIFF_SYMBOL_SUBMODULE_DEL:
+		set = diff_get_color_opt(o, DIFF_FILE_OLD);
+		reset = diff_get_color_opt(o, DIFF_RESET);
+		emit_line(o, set, reset, line, len);
+		break;
+	case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
+		fprintf(o->file, "%sSubmodule %s contains untracked content\n",
+			diff_line_prefix(o), line);
+		break;
+	case DIFF_SYMBOL_SUBMODULE_MODIFIED:
+		fprintf(o->file, "%sSubmodule %s contains modified content\n",
+			diff_line_prefix(o), line);
+		break;
+	case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
+		emit_line(o, "", "", " 0 files changed\n",
+			  strlen(" 0 files changed\n"));
+		break;
+	case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
+		emit_line(o, "", "", " ...\n", strlen(" ...\n"));
+		break;
+	case DIFF_SYMBOL_WORD_DIFF:
+		fprintf(o->file, "%.*s", len, line);
+		break;
+	case DIFF_SYMBOL_STAT_SEP:
+		fputs(o->stat_sep, o->file);
+		break;
+	default:
+		die("BUG: unknown diff symbol");
 	}
+	strbuf_release(&sb);
+}
+
+static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
+			     const char *line, int len, unsigned flags)
+{
+	struct emitted_diff_symbol e = {line, len, flags, s};
+
+	if (o->emitted_symbols)
+		append_emitted_diff_symbol(o, &e);
+	else
+		emit_diff_symbol_from_struct(o, &e);
+}
+
+void diff_emit_submodule_del(struct diff_options *o, const char *line)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
+}
+
+void diff_emit_submodule_add(struct diff_options *o, const char *line)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
+}
+
+void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
+			 path, strlen(path), 0);
+}
+
+void diff_emit_submodule_modified(struct diff_options *o, const char *path)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
+			 path, strlen(path), 0);
+}
+
+void diff_emit_submodule_header(struct diff_options *o, const char *header)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
+			 header, strlen(header), 0);
+}
+
+void diff_emit_submodule_error(struct diff_options *o, const char *err)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
+}
+
+void diff_emit_submodule_pipethrough(struct diff_options *o,
+				     const char *line, int len)
+{
+	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
+}
+
+static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
+{
+	if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
+	      ecbdata->blank_at_eof_in_preimage &&
+	      ecbdata->blank_at_eof_in_postimage &&
+	      ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
+	      ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
+		return 0;
+	return ws_blank_line(line, len, ecbdata->ws_rule);
 }
 
 static void emit_add_line(const char *reset,
 			  struct emit_callback *ecbdata,
 			  const char *line, int len)
 {
-	emit_line_checked(reset, ecbdata, line, len,
-			  DIFF_FILE_NEW, WSEH_NEW, '+');
+	unsigned flags = WSEH_NEW | ecbdata->ws_rule;
+	if (new_blank_line_at_eof(ecbdata, line, len))
+		flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;
+
+	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
 }
 
 static void emit_del_line(const char *reset,
 			  struct emit_callback *ecbdata,
 			  const char *line, int len)
 {
-	emit_line_checked(reset, ecbdata, line, len,
-			  DIFF_FILE_OLD, WSEH_OLD, '-');
+	unsigned flags = WSEH_OLD | ecbdata->ws_rule;
+	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
 }
 
 static void emit_context_line(const char *reset,
 			      struct emit_callback *ecbdata,
 			      const char *line, int len)
 {
-	emit_line_checked(reset, ecbdata, line, len,
-			  DIFF_CONTEXT, WSEH_CONTEXT, ' ');
+	unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
+	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
 }
 
 static void emit_hunk_header(struct emit_callback *ecbdata,
@@ -644,7 +1366,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
 	if (len < 10 ||
 	    memcmp(line, atat, 2) ||
 	    !(ep = memmem(line + 2, len - 2, atat, 2))) {
-		emit_line(ecbdata->opt, context, reset, line, len);
+		emit_diff_symbol(ecbdata->opt,
+				 DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
 		return;
 	}
 	ep += 2; /* skip over @@ */
@@ -678,7 +1401,9 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
 	}
 
 	strbuf_add(&msgbuf, line + len, org_len - len);
-	emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
+	strbuf_complete_line(&msgbuf);
+	emit_diff_symbol(ecbdata->opt,
+			 DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
 	strbuf_release(&msgbuf);
 }
 
@@ -694,23 +1419,23 @@ static void remove_tempfile(void)
 {
 	int i;
 	for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
-		if (is_tempfile_active(&diff_temp[i].tempfile))
+		if (is_tempfile_active(diff_temp[i].tempfile))
 			delete_tempfile(&diff_temp[i].tempfile);
 		diff_temp[i].name = NULL;
 	}
 }
 
-static void print_line_count(FILE *file, int count)
+static void add_line_count(struct strbuf *out, int count)
 {
 	switch (count) {
 	case 0:
-		fprintf(file, "0,0");
+		strbuf_addstr(out, "0,0");
 		break;
 	case 1:
-		fprintf(file, "1");
+		strbuf_addstr(out, "1");
 		break;
 	default:
-		fprintf(file, "1,%d", count);
+		strbuf_addf(out, "1,%d", count);
 		break;
 	}
 }
@@ -719,7 +1444,6 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
 			       int prefix, const char *data, int size)
 {
 	const char *endp = NULL;
-	static const char *nneof = " No newline at end of file\n";
 	const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
 
 	while (0 < size) {
@@ -737,13 +1461,8 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
 		size -= len;
 		data += len;
 	}
-	if (!endp) {
-		const char *context = diff_get_color(ecb->color_diff,
-						     DIFF_CONTEXT);
-		putc('\n', ecb->opt->file);
-		emit_line_0(ecb->opt, context, reset, '\\',
-			    nneof, strlen(nneof));
-	}
+	if (!endp)
+		emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
 }
 
 static void emit_rewrite_diff(const char *name_a,
@@ -755,16 +1474,12 @@ static void emit_rewrite_diff(const char *name_a,
 			      struct diff_options *o)
 {
 	int lc_a, lc_b;
-	const char *name_a_tab, *name_b_tab;
-	const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
-	const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
-	const char *reset = diff_get_color(o->use_color, DIFF_RESET);
 	static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
 	const char *a_prefix, *b_prefix;
 	char *data_one, *data_two;
 	size_t size_one, size_two;
 	struct emit_callback ecbdata;
-	const char *line_prefix = diff_line_prefix(o);
+	struct strbuf out = STRBUF_INIT;
 
 	if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
 		a_prefix = o->b_prefix;
@@ -776,8 +1491,6 @@ static void emit_rewrite_diff(const char *name_a,
 
 	name_a += (*name_a == '/');
 	name_b += (*name_b == '/');
-	name_a_tab = strchr(name_a, ' ') ? "\t" : "";
-	name_b_tab = strchr(name_b, ' ') ? "\t" : "";
 
 	strbuf_reset(&a_name);
 	strbuf_reset(&b_name);
@@ -804,18 +1517,23 @@ static void emit_rewrite_diff(const char *name_a,
 
 	lc_a = count_lines(data_one, size_one);
 	lc_b = count_lines(data_two, size_two);
-	fprintf(o->file,
-		"%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
-		line_prefix, metainfo, a_name.buf, name_a_tab, reset,
-		line_prefix, metainfo, b_name.buf, name_b_tab, reset,
-		line_prefix, fraginfo);
+
+	emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
+			 a_name.buf, a_name.len, 0);
+	emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
+			 b_name.buf, b_name.len, 0);
+
+	strbuf_addstr(&out, "@@ -");
 	if (!o->irreversible_delete)
-		print_line_count(o->file, lc_a);
+		add_line_count(&out, lc_a);
 	else
-		fprintf(o->file, "?,?");
-	fprintf(o->file, " +");
-	print_line_count(o->file, lc_b);
-	fprintf(o->file, " @@%s\n", reset);
+		strbuf_addstr(&out, "?,?");
+	strbuf_addstr(&out, " +");
+	add_line_count(&out, lc_b);
+	strbuf_addstr(&out, " @@\n");
+	emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
+	strbuf_release(&out);
+
 	if (lc_a && !o->irreversible_delete)
 		emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
 	if (lc_b)
@@ -828,7 +1546,7 @@ static void emit_rewrite_diff(const char *name_a,
 
 struct diff_words_buffer {
 	mmfile_t text;
-	long alloc;
+	unsigned long alloc;
 	struct diff_words_orig {
 		const char *begin, *end;
 	} *orig;
@@ -875,37 +1593,49 @@ struct diff_words_data {
 	struct diff_words_style *style;
 };
 
-static int fn_out_diff_words_write_helper(FILE *fp,
+static int fn_out_diff_words_write_helper(struct diff_options *o,
 					  struct diff_words_style_elem *st_el,
 					  const char *newline,
-					  size_t count, const char *buf,
-					  const char *line_prefix)
+					  size_t count, const char *buf)
 {
 	int print = 0;
+	struct strbuf sb = STRBUF_INIT;
 
 	while (count) {
 		char *p = memchr(buf, '\n', count);
 		if (print)
-			fputs(line_prefix, fp);
+			strbuf_addstr(&sb, diff_line_prefix(o));
+
 		if (p != buf) {
-			if (st_el->color && fputs(st_el->color, fp) < 0)
-				return -1;
-			if (fputs(st_el->prefix, fp) < 0 ||
-			    fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
-			    fputs(st_el->suffix, fp) < 0)
-				return -1;
-			if (st_el->color && *st_el->color
-			    && fputs(GIT_COLOR_RESET, fp) < 0)
-				return -1;
+			const char *reset = st_el->color && *st_el->color ?
+					    GIT_COLOR_RESET : NULL;
+			if (st_el->color && *st_el->color)
+				strbuf_addstr(&sb, st_el->color);
+			strbuf_addstr(&sb, st_el->prefix);
+			strbuf_add(&sb, buf, p ? p - buf : count);
+			strbuf_addstr(&sb, st_el->suffix);
+			if (reset)
+				strbuf_addstr(&sb, reset);
 		}
 		if (!p)
-			return 0;
-		if (fputs(newline, fp) < 0)
-			return -1;
+			goto out;
+
+		strbuf_addstr(&sb, newline);
 		count -= p + 1 - buf;
 		buf = p + 1;
 		print = 1;
+		if (count) {
+			emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+					 sb.buf, sb.len, 0);
+			strbuf_reset(&sb);
+		}
 	}
+
+out:
+	if (sb.len)
+		emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+				 sb.buf, sb.len, 0);
+	strbuf_release(&sb);
 	return 0;
 }
 
@@ -987,24 +1717,20 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
 		fputs(line_prefix, diff_words->opt->file);
 	}
 	if (diff_words->current_plus != plus_begin) {
-		fn_out_diff_words_write_helper(diff_words->opt->file,
+		fn_out_diff_words_write_helper(diff_words->opt,
 				&style->ctx, style->newline,
 				plus_begin - diff_words->current_plus,
-				diff_words->current_plus, line_prefix);
-		if (*(plus_begin - 1) == '\n')
-			fputs(line_prefix, diff_words->opt->file);
+				diff_words->current_plus);
 	}
 	if (minus_begin != minus_end) {
-		fn_out_diff_words_write_helper(diff_words->opt->file,
+		fn_out_diff_words_write_helper(diff_words->opt,
 				&style->old, style->newline,
-				minus_end - minus_begin, minus_begin,
-				line_prefix);
+				minus_end - minus_begin, minus_begin);
 	}
 	if (plus_begin != plus_end) {
-		fn_out_diff_words_write_helper(diff_words->opt->file,
+		fn_out_diff_words_write_helper(diff_words->opt,
 				&style->new, style->newline,
-				plus_end - plus_begin, plus_begin,
-				line_prefix);
+				plus_end - plus_begin, plus_begin);
 	}
 
 	diff_words->current_plus = plus_end;
@@ -1098,11 +1824,12 @@ static void diff_words_show(struct diff_words_data *diff_words)
 
 	/* special case: only removal */
 	if (!diff_words->plus.text.size) {
-		fputs(line_prefix, diff_words->opt->file);
-		fn_out_diff_words_write_helper(diff_words->opt->file,
+		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,
 			diff_words->minus.text.size,
-			diff_words->minus.text.ptr, line_prefix);
+			diff_words->minus.text.ptr);
 		diff_words->minus.text.size = 0;
 		return;
 	}
@@ -1125,12 +1852,12 @@ static void diff_words_show(struct diff_words_data *diff_words)
 	if (diff_words->current_plus != diff_words->plus.text.ptr +
 			diff_words->plus.text.size) {
 		if (color_words_output_graph_prefix(diff_words))
-			fputs(line_prefix, diff_words->opt->file);
-		fn_out_diff_words_write_helper(diff_words->opt->file,
+			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->ctx, style->newline,
 			diff_words->plus.text.ptr + diff_words->plus.text.size
-			- diff_words->current_plus, diff_words->current_plus,
-			line_prefix);
+			- diff_words->current_plus, diff_words->current_plus);
 	}
 	diff_words->minus.text.size = diff_words->plus.text.size = 0;
 }
@@ -1138,9 +1865,29 @@ static void diff_words_show(struct diff_words_data *diff_words)
 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
 static void diff_words_flush(struct emit_callback *ecbdata)
 {
+	struct diff_options *wo = ecbdata->diff_words->opt;
+
 	if (ecbdata->diff_words->minus.text.size ||
 	    ecbdata->diff_words->plus.text.size)
 		diff_words_show(ecbdata->diff_words);
+
+	if (wo->emitted_symbols) {
+		struct diff_options *o = ecbdata->opt;
+		struct emitted_diff_symbols *wol = wo->emitted_symbols;
+		int i;
+
+		/*
+		 * NEEDSWORK:
+		 * Instead of appending each, concat all words to a line?
+		 */
+		for (i = 0; i < wol->nr; i++)
+			append_emitted_diff_symbol(o, &wol->buf[i]);
+
+		for (i = 0; i < wol->nr; i++)
+			free((void *)wol->buf[i].line);
+
+		wol->nr = 0;
+	}
 }
 
 static void diff_filespec_load_driver(struct diff_filespec *one)
@@ -1176,6 +1923,11 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
 		xcalloc(1, sizeof(struct diff_words_data));
 	ecbdata->diff_words->type = o->word_diff;
 	ecbdata->diff_words->opt = o;
+
+	if (orig_opts->emitted_symbols)
+		o->emitted_symbols =
+			xcalloc(1, sizeof(struct emitted_diff_symbols));
+
 	if (!o->word_regex)
 		o->word_regex = userdiff_word_regex(one);
 	if (!o->word_regex)
@@ -1210,6 +1962,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)
 {
 	if (ecbdata->diff_words) {
 		diff_words_flush(ecbdata);
+		free (ecbdata->diff_words->opt->emitted_symbols);
 		free (ecbdata->diff_words->opt);
 		free (ecbdata->diff_words->minus.text.ptr);
 		free (ecbdata->diff_words->minus.orig);
@@ -1246,8 +1999,6 @@ static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, u
 	unsigned long allot;
 	size_t l = len;
 
-	if (ecb->truncate)
-		return ecb->truncate(line, len);
 	cp = line;
 	allot = l;
 	while (0 < l) {
@@ -1276,30 +2027,25 @@ static void find_lno(const char *line, struct emit_callback *ecbdata)
 static void fn_out_consume(void *priv, char *line, unsigned long len)
 {
 	struct emit_callback *ecbdata = priv;
-	const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
-	const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
 	const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
 	struct diff_options *o = ecbdata->opt;
-	const char *line_prefix = diff_line_prefix(o);
 
 	o->found_changes = 1;
 
 	if (ecbdata->header) {
-		fprintf(o->file, "%s", ecbdata->header->buf);
+		emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+				 ecbdata->header->buf, ecbdata->header->len, 0);
 		strbuf_reset(ecbdata->header);
 		ecbdata->header = NULL;
 	}
 
 	if (ecbdata->label_path[0]) {
-		const char *name_a_tab, *name_b_tab;
-
-		name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
-		name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
-
-		fprintf(o->file, "%s%s--- %s%s%s\n",
-			line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
-		fprintf(o->file, "%s%s+++ %s%s%s\n",
-			line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
+		emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
+				 ecbdata->label_path[0],
+				 strlen(ecbdata->label_path[0]), 0);
+		emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
+				 ecbdata->label_path[1],
+				 strlen(ecbdata->label_path[1]), 0);
 		ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
 	}
 
@@ -1315,12 +2061,13 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 		len = sane_truncate_line(ecbdata, line, len);
 		find_lno(line, ecbdata);
 		emit_hunk_header(ecbdata, line, len);
-		if (line[len-1] != '\n')
-			putc('\n', o->file);
 		return;
 	}
 
 	if (ecbdata->diff_words) {
+		enum diff_symbol s =
+			ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
+			DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
 		if (line[0] == '-') {
 			diff_words_append(line, len,
 					  &ecbdata->diff_words->minus);
@@ -1340,21 +2087,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 			return;
 		}
 		diff_words_flush(ecbdata);
-		if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
-			emit_line(o, context, reset, line, len);
-			fputs("~\n", o->file);
-		} else {
-			/*
-			 * Skip the prefix character, if any.  With
-			 * diff_suppress_blank_empty, there may be
-			 * none.
-			 */
-			if (line[0] != '\n') {
-			      line++;
-			      len--;
-			}
-			emit_line(o, context, reset, line, len);
-		}
+		emit_diff_symbol(o, s, line, len, 0);
 		return;
 	}
 
@@ -1375,8 +2108,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 	default:
 		/* incomplete line at the end */
 		ecbdata->lno_in_preimage++;
-		emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
-			  reset, line, len);
+		emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
+				 line, len, 0);
 		break;
 	}
 }
@@ -1521,20 +2254,14 @@ static int scale_linear(int it, int width, int max_change)
 	return 1 + (it * (width - 1) / max_change);
 }
 
-static void show_name(FILE *file,
-		      const char *prefix, const char *name, int len)
-{
-	fprintf(file, " %s%-*s |", prefix, len, name);
-}
-
-static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
+static void show_graph(struct strbuf *out, char ch, int cnt,
+		       const char *set, const char *reset)
 {
 	if (cnt <= 0)
 		return;
-	fprintf(file, "%s", set);
-	while (cnt--)
-		putc(ch, file);
-	fprintf(file, "%s", reset);
+	strbuf_addstr(out, set);
+	strbuf_addchars(out, ch, cnt);
+	strbuf_addstr(out, reset);
 }
 
 static void fill_print_name(struct diffstat_file *file)
@@ -1558,14 +2285,16 @@ static void fill_print_name(struct diffstat_file *file)
 	file->print_name = pname;
 }
 
-int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
+static void print_stat_summary_inserts_deletes(struct diff_options *options,
+		int files, int insertions, int deletions)
 {
 	struct strbuf sb = STRBUF_INIT;
-	int ret;
 
 	if (!files) {
 		assert(insertions == 0 && deletions == 0);
-		return fprintf(fp, "%s\n", " 0 files changed");
+		emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
+				 NULL, 0, 0);
+		return;
 	}
 
 	strbuf_addf(&sb,
@@ -1592,9 +2321,19 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
 			    deletions);
 	}
 	strbuf_addch(&sb, '\n');
-	ret = fputs(sb.buf, fp);
+	emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
+			 sb.buf, sb.len, 0);
 	strbuf_release(&sb);
-	return ret;
+}
+
+void print_stat_summary(FILE *fp, int files,
+			int insertions, int deletions)
+{
+	struct diff_options o;
+	memset(&o, 0, sizeof(o));
+	o.file = fp;
+
+	print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
 }
 
 static void show_stats(struct diffstat_t *data, struct diff_options *options)
@@ -1604,13 +2343,13 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 	int total_files = data->nr, count;
 	int width, name_width, graph_width, number_width = 0, bin_width = 0;
 	const char *reset, *add_c, *del_c;
-	const char *line_prefix = "";
 	int extra_shown = 0;
+	const char *line_prefix = diff_line_prefix(options);
+	struct strbuf out = STRBUF_INIT;
 
 	if (data->nr == 0)
 		return;
 
-	line_prefix = diff_line_prefix(options);
 	count = options->stat_count ? options->stat_count : data->nr;
 
 	reset = diff_get_color_opt(options, DIFF_RESET);
@@ -1764,26 +2503,32 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 		}
 
 		if (file->is_binary) {
-			fprintf(options->file, "%s", line_prefix);
-			show_name(options->file, prefix, name, len);
-			fprintf(options->file, " %*s", number_width, "Bin");
+			strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+			strbuf_addf(&out, " %*s", number_width, "Bin");
 			if (!added && !deleted) {
-				putc('\n', options->file);
+				strbuf_addch(&out, '\n');
+				emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+						 out.buf, out.len, 0);
+				strbuf_reset(&out);
 				continue;
 			}
-			fprintf(options->file, " %s%"PRIuMAX"%s",
+			strbuf_addf(&out, " %s%"PRIuMAX"%s",
 				del_c, deleted, reset);
-			fprintf(options->file, " -> ");
-			fprintf(options->file, "%s%"PRIuMAX"%s",
+			strbuf_addstr(&out, " -> ");
+			strbuf_addf(&out, "%s%"PRIuMAX"%s",
 				add_c, added, reset);
-			fprintf(options->file, " bytes");
-			fprintf(options->file, "\n");
+			strbuf_addstr(&out, " bytes\n");
+			emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+					 out.buf, out.len, 0);
+			strbuf_reset(&out);
 			continue;
 		}
 		else if (file->is_unmerged) {
-			fprintf(options->file, "%s", line_prefix);
-			show_name(options->file, prefix, name, len);
-			fprintf(options->file, " Unmerged\n");
+			strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+			strbuf_addstr(&out, " Unmerged\n");
+			emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+					 out.buf, out.len, 0);
+			strbuf_reset(&out);
 			continue;
 		}
 
@@ -1806,14 +2551,16 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 				add = total - del;
 			}
 		}
-		fprintf(options->file, "%s", line_prefix);
-		show_name(options->file, prefix, name, len);
-		fprintf(options->file, " %*"PRIuMAX"%s",
+		strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+		strbuf_addf(&out, " %*"PRIuMAX"%s",
 			number_width, added + deleted,
 			added + deleted ? " " : "");
-		show_graph(options->file, '+', add, add_c, reset);
-		show_graph(options->file, '-', del, del_c, reset);
-		fprintf(options->file, "\n");
+		show_graph(&out, '+', add, add_c, reset);
+		show_graph(&out, '-', del, del_c, reset);
+		strbuf_addch(&out, '\n');
+		emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+				 out.buf, out.len, 0);
+		strbuf_reset(&out);
 	}
 
 	for (i = 0; i < data->nr; i++) {
@@ -1834,11 +2581,14 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 		if (i < count)
 			continue;
 		if (!extra_shown)
-			fprintf(options->file, "%s ...\n", line_prefix);
+			emit_diff_symbol(options,
+					 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
+					 NULL, 0, 0);
 		extra_shown = 1;
 	}
-	fprintf(options->file, "%s", line_prefix);
-	print_stat_summary(options->file, total_files, adds, dels);
+
+	print_stat_summary_inserts_deletes(options, total_files, adds, dels);
+	strbuf_release(&out);
 }
 
 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
@@ -1850,7 +2600,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
 
 	for (i = 0; i < data->nr; i++) {
 		int added = data->files[i]->added;
-		int deleted= data->files[i]->deleted;
+		int deleted = data->files[i]->deleted;
 
 		if (data->files[i]->is_unmerged ||
 		    (!data->files[i]->is_interesting && (added + deleted == 0))) {
@@ -1860,8 +2610,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
 			dels += deleted;
 		}
 	}
-	fprintf(options->file, "%s", diff_line_prefix(options));
-	print_stat_summary(options->file, total_files, adds, dels);
+	print_stat_summary_inserts_deletes(options, total_files, adds, dels);
 }
 
 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
@@ -2225,8 +2974,8 @@ static unsigned char *deflate_it(char *data,
 	return deflated;
 }
 
-static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
-				  const char *prefix)
+static void emit_binary_diff_body(struct diff_options *o,
+				  mmfile_t *one, mmfile_t *two)
 {
 	void *cp;
 	void *delta;
@@ -2255,13 +3004,18 @@ static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
 	}
 
 	if (delta && delta_size < deflate_size) {
-		fprintf(file, "%sdelta %lu\n", prefix, orig_size);
+		char *s = xstrfmt("%lu", orig_size);
+		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
+				 s, strlen(s), 0);
+		free(s);
 		free(deflated);
 		data = delta;
 		data_size = delta_size;
-	}
-	else {
-		fprintf(file, "%sliteral %lu\n", prefix, two->size);
+	} else {
+		char *s = xstrfmt("%lu", two->size);
+		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
+				 s, strlen(s), 0);
+		free(s);
 		free(delta);
 		data = deflated;
 		data_size = deflate_size;
@@ -2270,8 +3024,9 @@ static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
 	/* emit data encoded in base85 */
 	cp = data;
 	while (data_size) {
+		int len;
 		int bytes = (52 < data_size) ? 52 : data_size;
-		char line[70];
+		char line[71];
 		data_size -= bytes;
 		if (bytes <= 26)
 			line[0] = bytes + 'A' - 1;
@@ -2279,20 +3034,24 @@ static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
 			line[0] = bytes - 26 + 'a' - 1;
 		encode_85(line + 1, cp, bytes);
 		cp = (char *) cp + bytes;
-		fprintf(file, "%s", prefix);
-		fputs(line, file);
-		fputc('\n', file);
+
+		len = strlen(line);
+		line[len++] = '\n';
+		line[len] = '\0';
+
+		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
+				 line, len, 0);
 	}
-	fprintf(file, "%s\n", prefix);
+	emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
 	free(data);
 }
 
-static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
-			     const char *prefix)
+static void emit_binary_diff(struct diff_options *o,
+			     mmfile_t *one, mmfile_t *two)
 {
-	fprintf(file, "%sGIT binary patch\n", prefix);
-	emit_binary_diff_body(file, one, two, prefix);
-	emit_binary_diff_body(file, two, one, prefix);
+	emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
+	emit_binary_diff_body(o, one, two);
+	emit_binary_diff_body(o, two, one);
 }
 
 int diff_filespec_is_binary(struct diff_filespec *one)
@@ -2369,24 +3128,16 @@ static void builtin_diff(const char *name_a,
 	if (o->submodule_format == DIFF_SUBMODULE_LOG &&
 	    (!one->mode || S_ISGITLINK(one->mode)) &&
 	    (!two->mode || S_ISGITLINK(two->mode))) {
-		const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
-		const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
-		show_submodule_summary(o->file, one->path ? one->path : two->path,
-				line_prefix,
+		show_submodule_summary(o, one->path ? one->path : two->path,
 				&one->oid, &two->oid,
-				two->dirty_submodule,
-				meta, del, add, reset);
+				two->dirty_submodule);
 		return;
 	} else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
 		   (!one->mode || S_ISGITLINK(one->mode)) &&
 		   (!two->mode || S_ISGITLINK(two->mode))) {
-		const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
-		const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
-		show_submodule_inline_diff(o->file, one->path ? one->path : two->path,
-				line_prefix,
+		show_submodule_inline_diff(o, one->path ? one->path : two->path,
 				&one->oid, &two->oid,
-				two->dirty_submodule,
-				meta, del, add, reset, o);
+				two->dirty_submodule);
 		return;
 	}
 
@@ -2435,7 +3186,8 @@ static void builtin_diff(const char *name_a,
 		if (complete_rewrite &&
 		    (textconv_one || !diff_filespec_is_binary(one)) &&
 		    (textconv_two || !diff_filespec_is_binary(two))) {
-			fprintf(o->file, "%s", header.buf);
+			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+					 header.buf, header.len, 0);
 			strbuf_reset(&header);
 			emit_rewrite_diff(name_a, name_b, one, two,
 						textconv_one, textconv_two, o);
@@ -2445,23 +3197,31 @@ static void builtin_diff(const char *name_a,
 	}
 
 	if (o->irreversible_delete && lbl[1][0] == '/') {
-		fprintf(o->file, "%s", header.buf);
+		emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
+				 header.len, 0);
 		strbuf_reset(&header);
 		goto free_ab_and_return;
 	} else if (!DIFF_OPT_TST(o, TEXT) &&
 	    ( (!textconv_one && diff_filespec_is_binary(one)) ||
 	      (!textconv_two && diff_filespec_is_binary(two)) )) {
+		struct strbuf sb = STRBUF_INIT;
 		if (!one->data && !two->data &&
 		    S_ISREG(one->mode) && S_ISREG(two->mode) &&
 		    !DIFF_OPT_TST(o, BINARY)) {
 			if (!oidcmp(&one->oid, &two->oid)) {
 				if (must_show_header)
-					fprintf(o->file, "%s", header.buf);
+					emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+							 header.buf, header.len,
+							 0);
 				goto free_ab_and_return;
 			}
-			fprintf(o->file, "%s", header.buf);
-			fprintf(o->file, "%sBinary files %s and %s differ\n",
-				line_prefix, lbl[0], lbl[1]);
+			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+					 header.buf, header.len, 0);
+			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
+				    diff_line_prefix(o), lbl[0], lbl[1]);
+			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
+					 sb.buf, sb.len, 0);
+			strbuf_release(&sb);
 			goto free_ab_and_return;
 		}
 		if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
@@ -2470,16 +3230,21 @@ static void builtin_diff(const char *name_a,
 		if (mf1.size == mf2.size &&
 		    !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
 			if (must_show_header)
-				fprintf(o->file, "%s", header.buf);
+				emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+						 header.buf, header.len, 0);
 			goto free_ab_and_return;
 		}
-		fprintf(o->file, "%s", header.buf);
+		emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
 		strbuf_reset(&header);
 		if (DIFF_OPT_TST(o, BINARY))
-			emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
-		else
-			fprintf(o->file, "%sBinary files %s and %s differ\n",
-				line_prefix, lbl[0], lbl[1]);
+			emit_binary_diff(o, &mf1, &mf2);
+		else {
+			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
+				    diff_line_prefix(o), lbl[0], lbl[1]);
+			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
+					 sb.buf, sb.len, 0);
+			strbuf_release(&sb);
+		}
 		o->found_changes = 1;
 	} else {
 		/* Crazy xdl interfaces.. */
@@ -2491,7 +3256,8 @@ static void builtin_diff(const char *name_a,
 		const struct userdiff_funcname *pe;
 
 		if (must_show_header) {
-			fprintf(o->file, "%s", header.buf);
+			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+					 header.buf, header.len, 0);
 			strbuf_reset(&header);
 		}
 
@@ -2960,7 +3726,6 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 			   const struct object_id *oid,
 			   int mode)
 {
-	int fd;
 	struct strbuf buf = STRBUF_INIT;
 	struct strbuf template = STRBUF_INIT;
 	char *path_dup = xstrdup(path);
@@ -2970,18 +3735,18 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 	strbuf_addstr(&template, "XXXXXX_");
 	strbuf_addstr(&template, base);
 
-	fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1);
-	if (fd < 0)
+	temp->tempfile = mks_tempfile_ts(template.buf, strlen(base) + 1);
+	if (!temp->tempfile)
 		die_errno("unable to create temp-file");
 	if (convert_to_working_tree(path,
 			(const char *)blob, (size_t)size, &buf)) {
 		blob = buf.buf;
 		size = buf.len;
 	}
-	if (write_in_full(fd, blob, size) != size)
+	if (write_in_full(temp->tempfile->fd, blob, size) < 0 ||
+	    close_tempfile_gently(temp->tempfile))
 		die_errno("unable to write temp-file");
-	close_tempfile(&temp->tempfile);
-	temp->name = get_tempfile_path(&temp->tempfile);
+	temp->name = get_tempfile_path(temp->tempfile);
 	oid_to_hex_r(temp->hex, oid);
 	xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
 	strbuf_release(&buf);
@@ -3249,7 +4014,7 @@ static void diff_fill_oid_info(struct diff_filespec *one)
 			}
 			if (lstat(one->path, &st) < 0)
 				die_errno("stat '%s'", one->path);
-			if (index_path(one->oid.hash, one->path, &st, 0))
+			if (index_path(&one->oid, one->path, &st, 0))
 				die("cannot hash %s", one->path);
 		}
 	}
@@ -3282,8 +4047,8 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o)
 	const char *other;
 	const char *attr_path;
 
-	name  = p->one->path;
-	other = (strcmp(name, p->two->path) ? p->two->path : NULL);
+	name  = one->path;
+	other = (strcmp(name, two->path) ? two->path : NULL);
 	attr_path = name;
 	if (o->prefix_length)
 		strip_prefix(o->prefix_length, &name, &other);
@@ -3406,6 +4171,8 @@ void diff_setup(struct diff_options *options)
 		options->a_prefix = "a/";
 		options->b_prefix = "b/";
 	}
+
+	options->color_moved = diff_color_moved_default;
 }
 
 void diff_setup_done(struct diff_options *options)
@@ -3515,6 +4282,9 @@ void diff_setup_done(struct diff_options *options)
 
 	if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
 		die(_("--follow requires exactly one pathspec"));
+
+	if (!options->use_color || external_diff())
+		options->color_moved = 0;
 }
 
 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
@@ -3939,7 +4709,19 @@ int diff_opt_parse(struct diff_options *options,
 	}
 	else if (!strcmp(arg, "--no-color"))
 		options->use_color = 0;
-	else if (!strcmp(arg, "--color-words")) {
+	else if (!strcmp(arg, "--color-moved")) {
+		if (diff_color_moved_default)
+			options->color_moved = diff_color_moved_default;
+		if (options->color_moved == COLOR_MOVED_NO)
+			options->color_moved = COLOR_MOVED_DEFAULT;
+	} else if (!strcmp(arg, "--no-color-moved"))
+		options->color_moved = COLOR_MOVED_NO;
+	else if (skip_prefix(arg, "--color-moved=", &arg)) {
+		int cm = parse_color_moved(arg);
+		if (cm < 0)
+			die("bad --color-moved argument: %s", arg);
+		options->color_moved = cm;
+	} else if (!strcmp(arg, "--color-words")) {
 		options->use_color = 1;
 		options->word_diff = DIFF_WORDS_COLOR;
 	}
@@ -4469,67 +5251,79 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
 	}
 }
 
-static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
+static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
 {
+	struct strbuf sb = STRBUF_INIT;
 	if (fs->mode)
-		fprintf(file, " %s mode %06o ", newdelete, fs->mode);
+		strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
 	else
-		fprintf(file, " %s ", newdelete);
-	write_name_quoted(fs->path, file, '\n');
-}
+		strbuf_addf(&sb, " %s ", newdelete);
 
+	quote_c_style(fs->path, &sb, NULL, 0);
+	strbuf_addch(&sb, '\n');
+	emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+			 sb.buf, sb.len, 0);
+	strbuf_release(&sb);
+}
 
-static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
-		const char *line_prefix)
+static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
+		int show_name)
 {
 	if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
-		fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
-			p->two->mode, show_name ? ' ' : '\n');
+		struct strbuf sb = STRBUF_INIT;
+		strbuf_addf(&sb, " mode change %06o => %06o",
+			    p->one->mode, p->two->mode);
 		if (show_name) {
-			write_name_quoted(p->two->path, file, '\n');
+			strbuf_addch(&sb, ' ');
+			quote_c_style(p->two->path, &sb, NULL, 0);
 		}
+		strbuf_addch(&sb, '\n');
+		emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+				 sb.buf, sb.len, 0);
+		strbuf_release(&sb);
 	}
 }
 
-static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
-			const char *line_prefix)
+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);
-
-	fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
+	strbuf_addf(&sb, " %s %s (%d%%)\n",
+			renamecopy, names, similarity_index(p));
 	free(names);
-	show_mode_change(file, p, 0, line_prefix);
+	emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+				 sb.buf, sb.len, 0);
+	show_mode_change(opt, p, 0);
+	strbuf_release(&sb);
 }
 
 static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
 {
-	FILE *file = opt->file;
-	const char *line_prefix = diff_line_prefix(opt);
-
 	switch(p->status) {
 	case DIFF_STATUS_DELETED:
-		fputs(line_prefix, file);
-		show_file_mode_name(file, "delete", p->one);
+		show_file_mode_name(opt, "delete", p->one);
 		break;
 	case DIFF_STATUS_ADDED:
-		fputs(line_prefix, file);
-		show_file_mode_name(file, "create", p->two);
+		show_file_mode_name(opt, "create", p->two);
 		break;
 	case DIFF_STATUS_COPIED:
-		fputs(line_prefix, file);
-		show_rename_copy(file, "copy", p, line_prefix);
+		show_rename_copy(opt, "copy", p);
 		break;
 	case DIFF_STATUS_RENAMED:
-		fputs(line_prefix, file);
-		show_rename_copy(file, "rename", p, line_prefix);
+		show_rename_copy(opt, "rename", p);
 		break;
 	default:
 		if (p->score) {
-			fprintf(file, "%s rewrite ", line_prefix);
-			write_name_quoted(p->two->path, file, ' ');
-			fprintf(file, "(%d%%)\n", similarity_index(p));
+			struct strbuf sb = STRBUF_INIT;
+			strbuf_addstr(&sb, " rewrite ");
+			quote_c_style(p->two->path, &sb, NULL, 0);
+			strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
+			emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+					 sb.buf, sb.len, 0);
+			strbuf_release(&sb);
 		}
-		show_mode_change(file, p, !p->score, line_prefix);
+		show_mode_change(opt, p, !p->score);
 		break;
 	}
 }
@@ -4734,6 +5528,51 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
 		warning(_(rename_limit_advice), varname, needed);
 }
 
+static void diff_flush_patch_all_file_pairs(struct diff_options *o)
+{
+	int i;
+	static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
+	struct diff_queue_struct *q = &diff_queued_diff;
+
+	if (WSEH_NEW & WS_RULE_MASK)
+		die("BUG: WS rules bit mask overlaps with diff symbol flags");
+
+	if (o->color_moved)
+		o->emitted_symbols = &esm;
+
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		if (check_pair_status(p))
+			diff_flush_patch(p, o);
+	}
+
+	if (o->emitted_symbols) {
+		if (o->color_moved) {
+			struct hashmap add_lines, del_lines;
+
+			hashmap_init(&del_lines,
+				     (hashmap_cmp_fn)moved_entry_cmp, o, 0);
+			hashmap_init(&add_lines,
+				     (hashmap_cmp_fn)moved_entry_cmp, o, 0);
+
+			add_lines_to_move_detection(o, &add_lines, &del_lines);
+			mark_color_as_moved(o, &add_lines, &del_lines);
+			if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
+				dim_moved_lines(o);
+
+			hashmap_free(&add_lines, 0);
+			hashmap_free(&del_lines, 0);
+		}
+
+		for (i = 0; i < esm.nr; i++)
+			emit_diff_symbol_from_struct(o, &esm.buf[i]);
+
+		for (i = 0; i < esm.nr; i++)
+			free((void *)esm.buf[i].line);
+	}
+	esm.nr = 0;
+}
+
 void diff_flush(struct diff_options *options)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
@@ -4806,6 +5645,7 @@ void diff_flush(struct diff_options *options)
 			fclose(options->file);
 		options->file = xfopen("/dev/null", "w");
 		options->close_file = 1;
+		options->color_moved = 0;
 		for (i = 0; i < q->nr; i++) {
 			struct diff_filepair *p = q->queue[i];
 			if (check_pair_status(p))
@@ -4817,20 +5657,14 @@ void diff_flush(struct diff_options *options)
 
 	if (output_format & DIFF_FORMAT_PATCH) {
 		if (separator) {
-			fprintf(options->file, "%s%c",
-				diff_line_prefix(options),
-				options->line_termination);
-			if (options->stat_sep) {
+			emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
+			if (options->stat_sep)
 				/* attach patch instead of inline */
-				fputs(options->stat_sep, options->file);
-			}
+				emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
+						 NULL, 0, 0);
 		}
 
-		for (i = 0; i < q->nr; i++) {
-			struct diff_filepair *p = q->queue[i];
-			if (check_pair_status(p))
-				diff_flush_patch(p, options);
-		}
+		diff_flush_patch_all_file_pairs(options);
 	}
 
 	if (output_format & DIFF_FORMAT_CALLBACK)
diff --git a/diff.h b/diff.h
index 2d442e296..aca150ba2 100644
--- a/diff.h
+++ b/diff.h
@@ -148,9 +148,9 @@ struct diff_options {
 	int abbrev;
 	int ita_invisible_in_index;
 /* white-space error highlighting */
-#define WSEH_NEW 1
-#define WSEH_CONTEXT 2
-#define WSEH_OLD 4
+#define WSEH_NEW (1<<12)
+#define WSEH_CONTEXT (1<<13)
+#define WSEH_OLD (1<<14)
 	unsigned ws_error_highlight;
 	const char *prefix;
 	int prefix_length;
@@ -186,8 +186,27 @@ struct diff_options {
 	void *output_prefix_data;
 
 	int diff_path_counter;
+
+	struct emitted_diff_symbols *emitted_symbols;
+	enum {
+		COLOR_MOVED_NO = 0,
+		COLOR_MOVED_PLAIN = 1,
+		COLOR_MOVED_ZEBRA = 2,
+		COLOR_MOVED_ZEBRA_DIM = 3,
+	} color_moved;
+	#define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
+	#define COLOR_MOVED_MIN_ALNUM_COUNT 20
 };
 
+void diff_emit_submodule_del(struct diff_options *o, const char *line);
+void diff_emit_submodule_add(struct diff_options *o, const char *line);
+void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
+void diff_emit_submodule_modified(struct diff_options *o, const char *path);
+void diff_emit_submodule_header(struct diff_options *o, const char *header);
+void diff_emit_submodule_error(struct diff_options *o, const char *err);
+void diff_emit_submodule_pipethrough(struct diff_options *o,
+				     const char *line, int len);
+
 enum color_diff {
 	DIFF_RESET = 0,
 	DIFF_CONTEXT = 1,
@@ -197,7 +216,15 @@ enum color_diff {
 	DIFF_FILE_NEW = 5,
 	DIFF_COMMIT = 6,
 	DIFF_WHITESPACE = 7,
-	DIFF_FUNCINFO = 8
+	DIFF_FUNCINFO = 8,
+	DIFF_FILE_OLD_MOVED = 9,
+	DIFF_FILE_OLD_MOVED_ALT = 10,
+	DIFF_FILE_OLD_MOVED_DIM = 11,
+	DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
+	DIFF_FILE_NEW_MOVED = 13,
+	DIFF_FILE_NEW_MOVED_ALT = 14,
+	DIFF_FILE_NEW_MOVED_DIM = 15,
+	DIFF_FILE_NEW_MOVED_ALT_DIM = 16
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \
@@ -396,8 +423,8 @@ extern int parse_rename_score(const char **cp_p);
 
 extern long parse_algorithm_value(const char *value);
 
-extern int print_stat_summary(FILE *fp, int files,
-			      int insertions, int deletions);
+extern void print_stat_summary(FILE *fp, int files,
+			       int insertions, int deletions);
 extern void setup_diff_pager(struct diff_options *);
 
 #endif /* DIFF_H */
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 786f38949..0d8c3d2ee 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -532,9 +532,9 @@ void diffcore_rename(struct diff_options *options)
 	}
 
 	if (options->show_rename_progress) {
-		progress = start_progress_delay(
+		progress = start_delayed_progress(
 				_("Performing inexact rename detection"),
-				rename_dst_nr * rename_src_nr, 50, 1);
+				rename_dst_nr * rename_src_nr);
 	}
 
 	mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
diff --git a/dir.c b/dir.c
index 1c55dc3e3..1d17b800c 100644
--- a/dir.c
+++ b/dir.c
@@ -49,7 +49,7 @@ struct cached_dir {
 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct index_state *istate, const char *path, int len,
 	struct untracked_cache_dir *untracked,
-	int check_only, const struct pathspec *pathspec);
+	int check_only, int stop_at_first_file, const struct pathspec *pathspec);
 static int get_dtype(struct dirent *de, struct index_state *istate,
 		     const char *path, int len);
 
@@ -1404,8 +1404,13 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 
 	untracked = lookup_untracked(dir->untracked, untracked,
 				     dirname + baselen, len - baselen);
+
+	/*
+	 * If this is an excluded directory, then we only need to check if
+	 * the directory contains any files.
+	 */
 	return read_directory_recursive(dir, istate, dirname, len,
-					untracked, 1, pathspec);
+					untracked, 1, exclude, pathspec);
 }
 
 /*
@@ -1633,7 +1638,7 @@ static enum path_treatment treat_path_fast(struct dir_struct *dir,
 		 * with check_only set.
 		 */
 		return read_directory_recursive(dir, istate, path->buf, path->len,
-						cdir->ucd, 1, pathspec);
+						cdir->ucd, 1, 0, pathspec);
 	/*
 	 * We get path_recurse in the first run when
 	 * directory_exists_in_index() returns index_nonexistent. We
@@ -1793,12 +1798,20 @@ static void close_cached_dir(struct cached_dir *cdir)
  * Also, we ignore the name ".git" (even if it is not a directory).
  * That likely will not change.
  *
+ * If 'stop_at_first_file' is specified, 'path_excluded' is returned
+ * to signal that a file was found. This is the least significant value that
+ * indicates that a file was encountered that does not depend on the order of
+ * whether an untracked or exluded path was encountered first.
+ *
  * Returns the most significant path_treatment value encountered in the scan.
+ * If 'stop_at_first_file' is specified, `path_excluded` is the most
+ * significant path_treatment value that will be returned.
  */
+
 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct index_state *istate, const char *base, int baselen,
 	struct untracked_cache_dir *untracked, int check_only,
-	const struct pathspec *pathspec)
+	int stop_at_first_file, const struct pathspec *pathspec)
 {
 	struct cached_dir cdir;
 	enum path_treatment state, subdir_state, dir_state = path_none;
@@ -1832,12 +1845,34 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 			subdir_state =
 				read_directory_recursive(dir, istate, path.buf,
 							 path.len, ud,
-							 check_only, pathspec);
+							 check_only, stop_at_first_file, pathspec);
 			if (subdir_state > dir_state)
 				dir_state = subdir_state;
 		}
 
 		if (check_only) {
+			if (stop_at_first_file) {
+				/*
+				 * If stopping at first file, then
+				 * signal that a file was found by
+				 * returning `path_excluded`. This is
+				 * to return a consistent value
+				 * regardless of whether an ignored or
+				 * excluded file happened to be
+				 * encountered 1st.
+				 *
+				 * In current usage, the
+				 * `stop_at_first_file` is passed when
+				 * an ancestor directory has matched
+				 * an exclude pattern, so any found
+				 * files will be excluded.
+				 */
+				if (dir_state >= path_excluded) {
+					dir_state = path_excluded;
+					break;
+				}
+			}
+
 			/* abort early if maximum state has been reached */
 			if (dir_state == path_untracked) {
 				if (cdir.fdir)
@@ -2108,7 +2143,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 		 */
 		dir->untracked = NULL;
 	if (!len || treat_leading_path(dir, istate, path, len, pathspec))
-		read_directory_recursive(dir, istate, path, len, untracked, 0, pathspec);
+		read_directory_recursive(dir, istate, path, len, untracked, 0, 0, pathspec);
 	QSORT(dir->entries, dir->nr, cmp_dir_entry);
 	QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
 
diff --git a/entry.c b/entry.c
index 65458f07a..944c183b0 100644
--- a/entry.c
+++ b/entry.c
@@ -3,6 +3,7 @@
 #include "dir.h"
 #include "streaming.h"
 #include "submodule.h"
+#include "progress.h"
 
 static void create_directories(const char *path, int path_len,
 			       const struct checkout *state)
@@ -161,16 +162,22 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)
 int finish_delayed_checkout(struct checkout *state)
 {
 	int errs = 0;
+	unsigned delayed_object_count;
+	off_t filtered_bytes = 0;
 	struct string_list_item *filter, *path;
+	struct progress *progress;
 	struct delayed_checkout *dco = state->delayed_checkout;
 
 	if (!state->delayed_checkout)
 		return errs;
 
 	dco->state = CE_RETRY;
+	delayed_object_count = dco->paths.nr;
+	progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
 	while (dco->filters.nr > 0) {
 		for_each_string_list_item(filter, &dco->filters) {
 			struct string_list available_paths = STRING_LIST_INIT_NODUP;
+			display_progress(progress, delayed_object_count - dco->paths.nr);
 
 			if (!async_query_available_blobs(filter->string, &available_paths)) {
 				/* Filter reported an error */
@@ -216,11 +223,17 @@ int finish_delayed_checkout(struct checkout *state)
 				}
 				ce = index_file_exists(state->istate, path->string,
 						       strlen(path->string), 0);
-				errs |= (ce ? checkout_entry(ce, state, NULL) : 1);
+				if (ce) {
+					errs |= checkout_entry(ce, state, NULL);
+					filtered_bytes += ce->ce_stat_data.sd_size;
+					display_throughput(progress, filtered_bytes);
+				} else
+					errs = 1;
 			}
 		}
 		string_list_remove_empty_items(&dco->filters, 0);
 	}
+	stop_progress(&progress);
 	string_list_clear(&dco->filters, 0);
 
 	/* At this point we should not have any delayed paths anymore. */
@@ -240,11 +253,13 @@ static int write_entry(struct cache_entry *ce,
 		       char *path, const struct checkout *state, int to_tempfile)
 {
 	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;
 	struct strbuf buf = STRBUF_INIT;
 	unsigned long size;
-	size_t wrote, newsize = 0;
+	ssize_t wrote;
+	size_t newsize = 0;
 	struct stat st;
 	const struct submodule *sub;
 
@@ -259,55 +274,65 @@ static int write_entry(struct cache_entry *ce,
 	}
 
 	switch (ce_mode_s_ifmt) {
-	case S_IFREG:
 	case S_IFLNK:
 		new = read_blob_entry(ce, &size);
 		if (!new)
 			return error("unable to read sha1 file of %s (%s)",
-				path, oid_to_hex(&ce->oid));
+				     path, oid_to_hex(&ce->oid));
 
-		if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) {
-			ret = symlink(new, path);
-			free(new);
-			if (ret)
-				return error_errno("unable to create symlink %s",
-						   path);
-			break;
+		/*
+		 * We can't make a real symlink; write out a regular file entry
+		 * with the symlink destination as its contents.
+		 */
+		if (!has_symlinks || to_tempfile)
+			goto write_file_entry;
+
+		ret = symlink(new, path);
+		free(new);
+		if (ret)
+			return error_errno("unable to create symlink %s", path);
+		break;
+
+	case S_IFREG:
+		/*
+		 * We do not send the blob in case of a retry, so do not
+		 * bother reading it at all.
+		 */
+		if (dco && dco->state == CE_RETRY) {
+			new = NULL;
+			size = 0;
+		} else {
+			new = read_blob_entry(ce, &size);
+			if (!new)
+				return error("unable to read sha1 file of %s (%s)",
+					     path, oid_to_hex(&ce->oid));
 		}
 
 		/*
 		 * Convert from git internal format to working tree format
 		 */
-		if (ce_mode_s_ifmt == S_IFREG) {
-			struct delayed_checkout *dco = state->delayed_checkout;
-			if (dco && dco->state != CE_NO_DELAY) {
-				/* Do not send the blob in case of a retry. */
-				if (dco->state == CE_RETRY) {
-					new = NULL;
-					size = 0;
-				}
-				ret = async_convert_to_working_tree(
-					ce->name, new, size, &buf, dco);
-				if (ret && string_list_has_string(&dco->paths, ce->name)) {
-					free(new);
-					goto finish;
-				}
-			} else
-				ret = convert_to_working_tree(
-					ce->name, new, size, &buf);
-
-			if (ret) {
+		if (dco && dco->state != CE_NO_DELAY) {
+			ret = async_convert_to_working_tree(ce->name, new,
+							    size, &buf, dco);
+			if (ret && string_list_has_string(&dco->paths, ce->name)) {
 				free(new);
-				new = strbuf_detach(&buf, &newsize);
-				size = newsize;
+				goto delayed;
 			}
-			/*
-			 * No "else" here as errors from convert are OK at this
-			 * point. If the error would have been fatal (e.g.
-			 * filter is required), then we would have died already.
-			 */
+		} else
+			ret = convert_to_working_tree(ce->name, new, size, &buf);
+
+		if (ret) {
+			free(new);
+			new = strbuf_detach(&buf, &newsize);
+			size = newsize;
 		}
+		/*
+		 * No "else" here as errors from convert are OK at this
+		 * point. If the error would have been fatal (e.g.
+		 * filter is required), then we would have died already.
+		 */
 
+	write_file_entry:
 		fd = open_output_fd(path, ce, to_tempfile);
 		if (fd < 0) {
 			free(new);
@@ -319,9 +344,10 @@ static int write_entry(struct cache_entry *ce,
 			fstat_done = fstat_output(fd, state, &st);
 		close(fd);
 		free(new);
-		if (wrote != size)
+		if (wrote < 0)
 			return error("unable to write file %s", path);
 		break;
+
 	case S_IFGITLINK:
 		if (to_tempfile)
 			return error("cannot create temporary submodule %s", path);
@@ -333,6 +359,7 @@ static int write_entry(struct cache_entry *ce,
 				NULL, oid_to_hex(&ce->oid),
 				state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0);
 		break;
+
 	default:
 		return error("unknown file mode for %s in index", path);
 	}
@@ -341,11 +368,14 @@ finish:
 	if (state->refresh_cache) {
 		assert(state->istate);
 		if (!fstat_done)
-			lstat(ce->name, &st);
+			if (lstat(ce->name, &st) < 0)
+				return error_errno("unable to stat just-written file %s",
+						   ce->name);
 		fill_stat_cache_info(ce, &st);
 		ce->ce_flags |= CE_UPDATE_IN_BASE;
 		state->istate->cache_changed |= CE_ENTRY_CHANGED;
 	}
+delayed:
 	return 0;
 }
 
diff --git a/environment.c b/environment.c
index 3fd4b1084..8289c25b4 100644
--- a/environment.c
+++ b/environment.c
@@ -97,7 +97,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 const char *namespace;
+static char *namespace;
 
 static const char *super_prefix;
 
@@ -152,8 +152,10 @@ void setup_git_env(void)
 	if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
 		check_replace_refs = 0;
 	replace_ref_base = getenv(GIT_REPLACE_REF_BASE_ENVIRONMENT);
+	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));
 	shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
 	if (shallow_file)
@@ -336,3 +338,8 @@ void reset_shared_repository(void)
 {
 	need_shared_repository_from_config = 1;
 }
+
+int use_optional_locks(void)
+{
+	return git_env_bool(GIT_OPTIONAL_LOCKS_ENVIRONMENT, 1);
+}
diff --git a/fast-import.c b/fast-import.c
index a959161b4..d5e4cf0ba 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -167,6 +167,7 @@ Format of STDIN stream:
 #include "quote.h"
 #include "dir.h"
 #include "run-command.h"
+#include "packfile.h"
 
 #define PACK_ID_BITS 16
 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -2951,7 +2952,7 @@ static void parse_reset_branch(const char *arg)
 
 static void cat_blob_write(const char *buf, unsigned long size)
 {
-	if (write_in_full(cat_blob_fd, buf, size) != size)
+	if (write_in_full(cat_blob_fd, buf, size) < 0)
 		die_errno("Write to frontend failed");
 }
 
@@ -3188,10 +3189,10 @@ static void checkpoint(void)
 	checkpoint_requested = 0;
 	if (object_count) {
 		cycle_packfile();
-		dump_branches();
-		dump_tags();
-		dump_marks();
 	}
+	dump_branches();
+	dump_tags();
+	dump_marks();
 }
 
 static void parse_checkpoint(void)
diff --git a/fetch-pack.c b/fetch-pack.c
index fbbc99c88..008b25d3d 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -17,6 +17,7 @@
 #include "prio-queue.h"
 #include "sha1-array.h"
 #include "oidset.h"
+#include "packfile.h"
 
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
@@ -610,7 +611,7 @@ static int tip_oids_contain(struct oidset *tip_oids,
 	 * add to "newlist" between calls, the additions will always be for
 	 * oids that are already in the set.
 	 */
-	if (!tip_oids->map.tablesize) {
+	if (!tip_oids->map.map.tablesize) {
 		add_refs_to_oidset(tip_oids, unmatched);
 		add_refs_to_oidset(tip_oids, newlist);
 	}
diff --git a/fsck.c b/fsck.c
index b1579c7e2..032699e9a 100644
--- a/fsck.c
+++ b/fsck.c
@@ -588,6 +588,7 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 		case S_IFREG | 0664:
 			if (!options->strict)
 				break;
+			/* fallthrough */
 		default:
 			has_bad_modes = 1;
 		}
@@ -736,7 +737,7 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
 		buffer += 41;
 		parent_line_count++;
 	}
-	graft = lookup_commit_graft(commit->object.oid.hash);
+	graft = lookup_commit_graft(&commit->object.oid);
 	parent_count = commit_list_count(commit->parents);
 	if (graft) {
 		if (graft->nr_parent == -1 && !parent_count)
diff --git a/git-compat-util.h b/git-compat-util.h
index 7d2c0ca75..cedad4d58 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -749,8 +749,6 @@ const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 extern int git_atexit(void (*handler)(void));
 #endif
 
-extern void release_pack_memory(size_t);
-
 typedef void (*try_to_free_t)(size_t);
 extern try_to_free_t set_try_to_free_routine(try_to_free_t);
 
@@ -900,9 +898,11 @@ static inline char *xstrdup_or_null(const char *str)
 
 static inline size_t xsize_t(off_t len)
 {
-	if (len > (size_t) len)
+	size_t size = (size_t) len;
+
+	if (len != (off_t) size)
 		die("Cannot handle files this big");
-	return (size_t)len;
+	return size;
 }
 
 __attribute__((format (printf, 3, 4)))
@@ -1171,4 +1171,24 @@ static inline int is_missing_file_error(int errno_)
 
 extern int cmd_main(int, const char **);
 
+/*
+ * You can mark a stack variable with UNLEAK(var) to avoid it being
+ * reported as a leak by tools like LSAN or valgrind. The argument
+ * should generally be the variable itself (not its address and not what
+ * it points to). It's safe to use this on pointers which may already
+ * have been freed, or on pointers which may still be in use.
+ *
+ * Use this _only_ for a variable that leaks by going out of scope at
+ * program exit (so only from cmd_* functions or their direct helpers).
+ * Normal functions, especially those which may be called multiple
+ * times, should actually free their memory. This is only meant as
+ * an annotation, and does nothing in non-leak-checking builds.
+ */
+#ifdef SUPPRESS_ANNOTATED_LEAKS
+extern void unleak_memory(const void *ptr, size_t len);
+#define UNLEAK(var) unleak_memory(&(var), sizeof(var))
+#else
+#define UNLEAK(var) do {} while (0)
+#endif
+
 #endif
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 3a74602ef..1b7e4b2cd 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -81,12 +81,12 @@ set_ident () {
 	finish_ident COMMITTER
 }
 
-USAGE="[--setup <command>] [--env-filter <command>]
+USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
 	[--tree-filter <command>] [--index-filter <command>]
 	[--parent-filter <command>] [--msg-filter <command>]
 	[--commit-filter <command>] [--tag-name-filter <command>]
-	[--subdirectory-filter <directory>] [--original <namespace>]
-	[-d <directory>] [-f | --force]
+	[--original <namespace>]
+	[-d <directory>] [-f | --force] [--state-branch <branch>]
 	[--] [<rev-list options>...]"
 
 OPTIONS_SPEC=
@@ -106,6 +106,7 @@ filter_msg=cat
 filter_commit=
 filter_tag_name=
 filter_subdir=
+state_branch=
 orig_namespace=refs/original/
 force=
 prune_empty=
@@ -153,6 +154,10 @@ do
 	--setup)
 		filter_setup="$OPTARG"
 		;;
+	--subdirectory-filter)
+		filter_subdir="$OPTARG"
+		remap_to_ancestor=t
+		;;
 	--env-filter)
 		filter_env="$OPTARG"
 		;;
@@ -174,13 +179,12 @@ do
 	--tag-name-filter)
 		filter_tag_name="$OPTARG"
 		;;
-	--subdirectory-filter)
-		filter_subdir="$OPTARG"
-		remap_to_ancestor=t
-		;;
 	--original)
 		orig_namespace=$(expr "$OPTARG/" : '\(.*[^/]\)/*$')/
 		;;
+	--state-branch)
+		state_branch="$OPTARG"
+		;;
 	*)
 		usage
 		;;
@@ -219,6 +223,13 @@ trap 'cd "$orig_dir"; rm -rf "$tempdir"' 0
 ORIG_GIT_DIR="$GIT_DIR"
 ORIG_GIT_WORK_TREE="$GIT_WORK_TREE"
 ORIG_GIT_INDEX_FILE="$GIT_INDEX_FILE"
+ORIG_GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME"
+ORIG_GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL"
+ORIG_GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE"
+ORIG_GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME"
+ORIG_GIT_COMMITTER_EMAIL="$GIT_COMMITTER_EMAIL"
+ORIG_GIT_COMMITTER_DATE="$GIT_COMMITTER_DATE"
+
 GIT_WORK_TREE=.
 export GIT_DIR GIT_WORK_TREE
 
@@ -252,6 +263,26 @@ export GIT_INDEX_FILE
 # map old->new commit ids for rewriting parents
 mkdir ../map || die "Could not create map/ directory"
 
+if test -n "$state_branch"
+then
+	state_commit=$(git rev-parse --no-flags --revs-only "$state_branch")
+	if test -n "$state_commit"
+	then
+		echo "Populating map from $state_branch ($state_commit)" 1>&2
+		perl -e'open(MAP, "-|", "git show $ARGV[0]:filter.map") or die;
+			while (<MAP>) {
+				m/(.*):(.*)/ or die;
+				open F, ">../map/$1" or die;
+				print F "$2" or die;
+				close(F) or die;
+			}
+			close(MAP) or die;' "$state_commit" \
+				|| die "Unable to load state from $state_branch:filter.map"
+	else
+		echo "Branch $state_branch does not exist. Will create" 1>&2
+	fi
+fi
+
 # we need "--" only if there are no path arguments in $@
 nonrevs=$(git rev-parse --no-revs "$@") || exit
 if test -z "$nonrevs"
@@ -530,7 +561,7 @@ if [ "$filter_tag_name" ]; then
 					}' \
 				    -e '/^-----BEGIN PGP SIGNATURE-----/q' \
 				    -e 'p' ) |
-				git mktag) ||
+				git hash-object -t tag -w --stdin) ||
 				die "Could not create new tag object for $ref"
 			if git cat-file tag "$ref" | \
 			   sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
@@ -544,12 +575,9 @@ if [ "$filter_tag_name" ]; then
 	done
 fi
 
-cd "$orig_dir"
-rm -rf "$tempdir"
-
-trap - 0
-
 unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
+unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
 test -z "$ORIG_GIT_DIR" || {
 	GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
 }
@@ -561,6 +589,58 @@ test -z "$ORIG_GIT_INDEX_FILE" || {
 	GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
 	export GIT_INDEX_FILE
 }
+test -z "$ORIG_GIT_AUTHOR_NAME" || {
+	GIT_AUTHOR_NAME="$ORIG_GIT_AUTHOR_NAME" &&
+	export GIT_AUTHOR_NAME
+}
+test -z "$ORIG_GIT_AUTHOR_EMAIL" || {
+	GIT_AUTHOR_EMAIL="$ORIG_GIT_AUTHOR_EMAIL" &&
+	export GIT_AUTHOR_EMAIL
+}
+test -z "$ORIG_GIT_AUTHOR_DATE" || {
+	GIT_AUTHOR_DATE="$ORIG_GIT_AUTHOR_DATE" &&
+	export GIT_AUTHOR_DATE
+}
+test -z "$ORIG_GIT_COMMITTER_NAME" || {
+	GIT_COMMITTER_NAME="$ORIG_GIT_COMMITTER_NAME" &&
+	export GIT_COMMITTER_NAME
+}
+test -z "$ORIG_GIT_COMMITTER_EMAIL" || {
+	GIT_COMMITTER_EMAIL="$ORIG_GIT_COMMITTER_EMAIL" &&
+	export GIT_COMMITTER_EMAIL
+}
+test -z "$ORIG_GIT_COMMITTER_DATE" || {
+	GIT_COMMITTER_DATE="$ORIG_GIT_COMMITTER_DATE" &&
+	export GIT_COMMITTER_DATE
+}
+
+if test -n "$state_branch"
+then
+	echo "Saving rewrite state to $state_branch" 1>&2
+	state_blob=$(
+		perl -e'opendir D, "../map" or die;
+			open H, "|-", "git hash-object -w --stdin" or die;
+			foreach (sort readdir(D)) {
+				next if m/^\.\.?$/;
+				open F, "<../map/$_" or die;
+				chomp($f = <F>);
+				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)
+	if test -n "$state_commit"
+	then
+		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
+	else
+		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" )
+	fi
+	git update-ref "$state_branch" "$state_commit"
+fi
+
+cd "$orig_dir"
+rm -rf "$tempdir"
+
+trap - 0
 
 if [ "$(is_bare_repository)" = false ]; then
 	git read-tree -u -m HEAD || exit
diff --git a/git-gui/po/README b/git-gui/po/README
index 0f5837d48..2514bc22a 100644
--- a/git-gui/po/README
+++ b/git-gui/po/README
@@ -165,7 +165,7 @@ to contribute an update.  This may be because you would want to improve
 the translation of existing messages, or because the git-gui software
 itself was updated and there are new messages that need translation.
 
-In any case, make sure you are up-to-date before starting your work:
+In any case, make sure you are up to date before starting your work:
 
 	$ git checkout master
 	$ git pull
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 6c390d6c2..7d19d3795 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -74,7 +74,7 @@ do
 
 	case "$LF$common$LF" in
 	*"$LF$SHA1$LF"*)
-		eval_gettextln "Already up-to-date with \$pretty_name"
+		eval_gettextln "Already up to date with \$pretty_name"
 		continue
 		;;
 	esac
diff --git a/git-p4.py b/git-p4.py
index 2fa581789..76859b453 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3614,7 +3614,7 @@ class P4Rebase(Command):
 
     def rebase(self):
         if os.system("git update-index --refresh") != 0:
-            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.");
+            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
         if len(read_pipe("git diff-index HEAD --")) > 0:
             die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
 
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 319933e70..6e64d40d6 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -53,6 +53,7 @@ else
 
 	git format-patch -k --stdout --full-index --cherry-pick --right-only \
 		--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
+		$git_format_patch_opt \
 		"$revisions" ${restrict_revision+^$restrict_revision} \
 		>"$GIT_DIR/rebased-patches"
 	ret=$?
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 29b7e8824..2563dc52d 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -155,13 +155,13 @@ reschedule_last_action () {
 append_todo_help () {
 	gettext "
 Commands:
- p, pick = use commit
- r, reword = use commit, but edit the commit message
- e, edit = use commit, but stop for amending
- s, squash = use commit, but meld into previous commit
- f, fixup = like \"squash\", but discard this commit's log message
- x, exec = run command (the rest of the line) using shell
- d, drop = remove commit
+p, pick = use commit
+r, reword = use commit, but edit the commit message
+e, edit = use commit, but stop for amending
+s, squash = use commit, but meld into previous commit
+f, fixup = like \"squash\", but discard this commit's log message
+x, exec = run command (the rest of the line) using shell
+d, drop = remove commit
 
 These lines can be re-ordered; they are executed from top to bottom.
 " | git stripspace --comment-lines >>"$todo"
@@ -714,154 +714,12 @@ do_rest () {
 	done
 }
 
-# skip picking commits whose parents are unchanged
-skip_unnecessary_picks () {
-	fd=3
-	while read -r command rest
-	do
-		# fd=3 means we skip the command
-		case "$fd,$command" in
-		3,pick|3,p)
-			# pick a commit whose parent is current $onto -> skip
-			sha1=${rest%% *}
-			case "$(git rev-parse --verify --quiet "$sha1"^)" in
-			"$onto"*)
-				onto=$sha1
-				;;
-			*)
-				fd=1
-				;;
-			esac
-			;;
-		3,"$comment_char"*|3,)
-			# copy comments
-			;;
-		*)
-			fd=1
-			;;
-		esac
-		printf '%s\n' "$command${rest:+ }$rest" >&$fd
-	done <"$todo" >"$todo.new" 3>>"$done" &&
-	mv -f "$todo".new "$todo" &&
-	case "$(peek_next_command)" in
-	squash|s|fixup|f)
-		record_in_rewritten "$onto"
-		;;
-	esac ||
-		die "$(gettext "Could not skip unnecessary pick commands")"
-}
-
-transform_todo_ids () {
-	while read -r command rest
-	do
-		case "$command" in
-		"$comment_char"* | exec)
-			# Be careful for oddball commands like 'exec'
-			# that do not have a SHA-1 at the beginning of $rest.
-			;;
-		*)
-			sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[	 ]*}) &&
-			rest="$sha1 ${rest#*[	 ]}"
-			;;
-		esac
-		printf '%s\n' "$command${rest:+ }$rest"
-	done <"$todo" >"$todo.new" &&
-	mv -f "$todo.new" "$todo"
-}
-
 expand_todo_ids() {
-	transform_todo_ids
+	git rebase--helper --expand-ids
 }
 
 collapse_todo_ids() {
-	transform_todo_ids --short
-}
-
-# Rearrange the todo list that has both "pick sha1 msg" and
-# "pick sha1 fixup!/squash! msg" appears in it so that the latter
-# comes immediately after the former, and change "pick" to
-# "fixup"/"squash".
-#
-# Note that if the config has specified a custom instruction format
-# each log message will be re-retrieved in order to normalize the
-# autosquash arrangement
-rearrange_squash () {
-	# extract fixup!/squash! lines and resolve any referenced sha1's
-	while read -r pick sha1 message
-	do
-		test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
-		case "$message" in
-		"squash! "*|"fixup! "*)
-			action="${message%%!*}"
-			rest=$message
-			prefix=
-			# skip all squash! or fixup! (but save for later)
-			while :
-			do
-				case "$rest" in
-				"squash! "*|"fixup! "*)
-					prefix="$prefix${rest%%!*},"
-					rest="${rest#*! }"
-					;;
-				*)
-					break
-					;;
-				esac
-			done
-			printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
-			# if it's a single word, try to resolve to a full sha1 and
-			# emit a second copy. This allows us to match on both message
-			# and on sha1 prefix
-			if test "${rest#* }" = "$rest"; then
-				fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
-				if test -n "$fullsha"; then
-					# prefix the action to uniquely identify this line as
-					# intended for full sha1 match
-					echo "$sha1 +$action $prefix $fullsha"
-				fi
-			fi
-		esac
-	done >"$1.sq" <"$1"
-	test -s "$1.sq" || return
-
-	used=
-	while read -r pick sha1 message
-	do
-		case " $used" in
-		*" $sha1 "*) continue ;;
-		esac
-		printf '%s\n' "$pick $sha1 $message"
-		test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
-		used="$used$sha1 "
-		while read -r squash action msg_prefix msg_content
-		do
-			case " $used" in
-			*" $squash "*) continue ;;
-			esac
-			emit=0
-			case "$action" in
-			+*)
-				action="${action#+}"
-				# full sha1 prefix test
-				case "$msg_content" in "$sha1"*) emit=1;; esac ;;
-			*)
-				# message prefix test
-				case "$message" in "$msg_content"*) emit=1;; esac ;;
-			esac
-			if test $emit = 1; then
-				if test -n "${format}"
-				then
-					msg_content=$(git log -n 1 --format="${format}" ${squash})
-				else
-					msg_content="$(echo "$msg_prefix" | sed "s/,/! /g")$msg_content"
-				fi
-				printf '%s\n' "$action $squash $msg_content"
-				used="$used$squash "
-			fi
-		done <"$1.sq"
-	done >"$1.rearranged" <"$1"
-	cat "$1.rearranged" >"$1"
-	rm -f "$1.sq" "$1.rearranged"
+	git rebase--helper --shorten-ids
 }
 
 # Add commands after a pick or after a squash/fixup serie
@@ -885,96 +743,6 @@ add_exec_commands () {
 	mv "$1.new" "$1"
 }
 
-# Check if the SHA-1 passed as an argument is a
-# correct one, if not then print $2 in "$todo".badsha
-# $1: the SHA-1 to test
-# $2: the line number of the input
-# $3: the input filename
-check_commit_sha () {
-	badsha=0
-	if test -z "$1"
-	then
-		badsha=1
-	else
-		sha1_verif="$(git rev-parse --verify --quiet $1^{commit})"
-		if test -z "$sha1_verif"
-		then
-			badsha=1
-		fi
-	fi
-
-	if test $badsha -ne 0
-	then
-		line="$(sed -n -e "${2}p" "$3")"
-		warn "$(eval_gettext "\
-Warning: the SHA-1 is missing or isn't a commit in the following line:
- - \$line")"
-		warn
-	fi
-
-	return $badsha
-}
-
-# prints the bad commits and bad commands
-# from the todolist in stdin
-check_bad_cmd_and_sha () {
-	retval=0
-	lineno=0
-	while read -r command rest
-	do
-		lineno=$(( $lineno + 1 ))
-		case $command in
-		"$comment_char"*|''|noop|x|exec)
-			# Doesn't expect a SHA-1
-			;;
-		"$cr")
-			# Work around CR left by "read" (e.g. with Git for
-			# Windows' Bash).
-			;;
-		pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
-			if ! check_commit_sha "${rest%%[ 	]*}" "$lineno" "$1"
-			then
-				retval=1
-			fi
-			;;
-		*)
-			line="$(sed -n -e "${lineno}p" "$1")"
-			warn "$(eval_gettext "\
-Warning: the command isn't recognized in the following line:
- - \$line")"
-			warn
-			retval=1
-			;;
-		esac
-	done <"$1"
-	return $retval
-}
-
-# Print the list of the SHA-1 of the commits
-# from stdin to stdout
-todo_list_to_sha_list () {
-	git stripspace --strip-comments |
-	while read -r command sha1 rest
-	do
-		case $command in
-		"$comment_char"*|''|noop|x|"exec")
-			;;
-		*)
-			long_sha=$(git rev-list --no-walk "$sha1" 2>/dev/null)
-			printf "%s\n" "$long_sha"
-			;;
-		esac
-	done
-}
-
-# Use warn for each line in stdin
-warn_lines () {
-	while read -r line
-	do
-		warn " - $line"
-	done
-}
-
 # Switch to the branch in $into and notify it in the reflog
 checkout_onto () {
 	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
@@ -989,74 +757,6 @@ get_missing_commit_check_level () {
 	printf '%s' "$check_level" | tr 'A-Z' 'a-z'
 }
 
-# Check if the user dropped some commits by mistake
-# Behaviour determined by rebase.missingCommitsCheck.
-# Check if there is an unrecognized command or a
-# bad SHA-1 in a command.
-check_todo_list () {
-	raise_error=f
-
-	check_level=$(get_missing_commit_check_level)
-
-	case "$check_level" in
-	warn|error)
-		# Get the SHA-1 of the commits
-		todo_list_to_sha_list <"$todo".backup >"$todo".oldsha1
-		todo_list_to_sha_list <"$todo" >"$todo".newsha1
-
-		# Sort the SHA-1 and compare them
-		sort -u "$todo".oldsha1 >"$todo".oldsha1+
-		mv "$todo".oldsha1+ "$todo".oldsha1
-		sort -u "$todo".newsha1 >"$todo".newsha1+
-		mv "$todo".newsha1+ "$todo".newsha1
-		comm -2 -3 "$todo".oldsha1 "$todo".newsha1 >"$todo".miss
-
-		# Warn about missing commits
-		if test -s "$todo".miss
-		then
-			test "$check_level" = error && raise_error=t
-
-			warn "$(gettext "\
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):")"
-
-			# Make the list user-friendly and display
-			opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin"
-			git rev-list $opt <"$todo".miss | warn_lines
-
-			warn "$(gettext "\
-To avoid this message, use \"drop\" to explicitly remove a commit.
-
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.")"
-			warn
-		fi
-		;;
-	ignore)
-		;;
-	*)
-		warn "$(eval_gettext "Unrecognized setting \$check_level for option rebase.missingCommitsCheck. Ignoring.")"
-		;;
-	esac
-
-	if ! check_bad_cmd_and_sha "$todo"
-	then
-		raise_error=t
-	fi
-
-	if test $raise_error = t
-	then
-		# Checkout before the first commit of the
-		# rebase: this way git rebase --continue
-		# will work correctly as it expects HEAD to be
-		# placed before the commit of the next action
-		checkout_onto
-
-		warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
-		die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
-	fi
-}
-
 # 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
@@ -1211,26 +911,27 @@ else
 	revisions=$onto...$orig_head
 	shortrevisions=$shorthead
 fi
-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}" \
-	--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 "
-	else
-		comment_out=
-	fi
+if test t != "$preserve_merges"
+then
+	git rebase--helper --make-script ${keep_empty:+--keep-empty} \
+		$revisions ${restrict_revision+^$restrict_revision} >"$todo"
+else
+	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}" \
+		--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 "
+		else
+			comment_out=
+		fi
 
-	if test t != "$preserve_merges"
-	then
-		printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
-	else
 		if test -z "$rebase_root"
 		then
 			preserve=t
@@ -1249,8 +950,8 @@ do
 			touch "$rewritten"/$sha1
 			printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
 		fi
-	fi
-done
+	done
+fi
 
 # Watch for commits that been dropped by --cherry-pick
 if test t = "$preserve_merges"
@@ -1280,7 +981,7 @@ then
 fi
 
 test -s "$todo" || echo noop >> "$todo"
-test -n "$autosquash" && rearrange_squash "$todo"
+test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
 test -n "$cmd" && add_exec_commands "$todo"
 
 todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
@@ -1316,11 +1017,17 @@ git_sequence_editor "$todo" ||
 has_action "$todo" ||
 	return 2
 
-check_todo_list
+git rebase--helper --check-todo-list || {
+	ret=$?
+	checkout_onto
+	exit $ret
+}
 
 expand_todo_ids
 
-test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
+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"
diff --git a/git-rebase.sh b/git-rebase.sh
index 2cf73b88e..6344e8d5e 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -55,9 +55,10 @@ LF='
 '
 ok_to_skip_pre_rebase=
 resolvemsg="
-$(gettext 'When you have resolved this problem, run "git rebase --continue".
-If you prefer to skip this patch, run "git rebase --skip" instead.
-To check out the original branch and stop rebasing, run "git rebase --abort".')
+$(gettext 'Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".')
 "
 unset onto
 unset restrict_revision
@@ -73,6 +74,7 @@ test "$(git config --bool rebase.stat)" = true && diffstat=t
 autostash="$(git config --bool rebase.autostash || echo false)"
 fork_point=auto
 git_am_opt=
+git_format_patch_opt=
 rebase_root=
 force_rebase=
 allow_rerere_autoupdate=
@@ -348,6 +350,9 @@ do
 		shift
 		break
 		;;
+	*)
+		usage
+		;;
 	esac
 	shift
 done
@@ -444,6 +449,11 @@ else
 	state_dir="$apply_dir"
 fi
 
+if test -t 2 && test -z "$GIT_QUIET"
+then
+	git_format_patch_opt="$git_format_patch_opt --progress"
+fi
+
 if test -z "$rebase_root"
 then
 	case "$#" in
diff --git a/git-stash.sh b/git-stash.sh
index 328cd80d8..8b2ce9afd 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -307,6 +307,12 @@ push_stash () {
 
 	if test -z "$patch_mode"
 	then
+		test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
+		if test -n "$untracked"
+		then
+			git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
+		fi
+
 		if test $# != 0
 		then
 			git reset -q -- "$@"
@@ -316,11 +322,6 @@ push_stash () {
 		else
 			git reset --hard -q
 		fi
-		test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
-		if test -n "$untracked"
-		then
-			git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
-		fi
 
 		if test "$keep_index" = "t" && test -n "$i_tree"
 		then
diff --git a/git.c b/git.c
index 6b6d9f68e..9e96dd409 100644
--- a/git.c
+++ b/git.c
@@ -182,6 +182,10 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 			setenv(GIT_ICASE_PATHSPECS_ENVIRONMENT, "1", 1);
 			if (envchanged)
 				*envchanged = 1;
+		} else if (!strcmp(cmd, "--no-optional-locks")) {
+			setenv(GIT_OPTIONAL_LOCKS_ENVIRONMENT, "0", 1);
+			if (envchanged)
+				*envchanged = 1;
 		} else if (!strcmp(cmd, "--shallow-file")) {
 			(*argv)++;
 			(*argc)--;
@@ -404,7 +408,7 @@ static struct cmd_struct commands[] = {
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
 	{ "gc", cmd_gc, RUN_SETUP },
 	{ "get-tar-commit-id", cmd_get_tar_commit_id },
-	{ "grep", cmd_grep, RUN_SETUP_GENTLY | SUPPORT_SUPER_PREFIX },
+	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
 	{ "hash-object", cmd_hash_object },
 	{ "help", cmd_help },
 	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 9208f42ed..959f04b49 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5967,6 +5967,9 @@ sub git_history_body {
 		      $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
 
 		if ($ftype eq 'blob') {
+			print " | " .
+			      $cgi->a({-href => href(action=>"blob_plain", hash_base=>$commit, file_name=>$file_name)}, "raw");
+
 			my $blob_current = $file_hash;
 			my $blob_parent  = git_get_hash_by_path($commit, $file_name);
 			if (defined $blob_current && defined $blob_parent &&
diff --git a/gpg-interface.c b/gpg-interface.c
index d936f3a32..4feacf16e 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -202,26 +202,26 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
 			 struct strbuf *gpg_output, struct strbuf *gpg_status)
 {
 	struct child_process gpg = CHILD_PROCESS_INIT;
-	static struct tempfile temp;
-	int fd, ret;
+	struct tempfile *temp;
+	int ret;
 	struct strbuf buf = STRBUF_INIT;
 
-	fd = mks_tempfile_t(&temp, ".git_vtag_tmpXXXXXX");
-	if (fd < 0)
+	temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+	if (!temp)
 		return error_errno(_("could not create temporary file"));
-	if (write_in_full(fd, signature, signature_size) < 0) {
+	if (write_in_full(temp->fd, signature, signature_size) < 0 ||
+	    close_tempfile_gently(temp) < 0) {
 		error_errno(_("failed writing detached signature to '%s'"),
-			    temp.filename.buf);
+			    temp->filename.buf);
 		delete_tempfile(&temp);
 		return -1;
 	}
-	close(fd);
 
 	argv_array_pushl(&gpg.args,
 			 gpg_program,
 			 "--status-fd=1",
 			 "--keyid-format=long",
-			 "--verify", temp.filename.buf, "-",
+			 "--verify", temp->filename.buf, "-",
 			 NULL);
 
 	if (!gpg_status)
diff --git a/graph.c b/graph.c
index e7e20650d..e1f6d3bdd 100644
--- a/graph.c
+++ b/graph.c
@@ -696,12 +696,8 @@ static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
 	 * This way, fields printed to the right of the graph will remain
 	 * aligned for the entire commit.
 	 */
-	int extra;
-	if (chars_written >= graph->width)
-		return;
-
-	extra = graph->width - chars_written;
-	strbuf_addf(sb, "%*s", (int) extra, "");
+	if (chars_written < graph->width)
+		strbuf_addchars(sb, ' ', graph->width - chars_written);
 }
 
 static void graph_output_padding_line(struct git_graph *graph,
@@ -787,7 +783,7 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
 		if (col->commit == graph->commit) {
 			seen_this = 1;
 			strbuf_write_column(sb, col, '|');
-			strbuf_addf(sb, "%*s", graph->expansion_row, "");
+			strbuf_addchars(sb, ' ', graph->expansion_row);
 			chars_written += 1 + graph->expansion_row;
 		} else if (seen_this && (graph->expansion_row == 0)) {
 			/*
diff --git a/grep.c b/grep.c
index c9e7cc735..ce6a48e63 100644
--- a/grep.c
+++ b/grep.c
@@ -1927,16 +1927,6 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
 	case GREP_SOURCE_FILE:
 		gs->identifier = xstrdup(identifier);
 		break;
-	case GREP_SOURCE_SUBMODULE:
-		if (!identifier) {
-			gs->identifier = NULL;
-			break;
-		}
-		/*
-		 * FALL THROUGH
-		 * If the identifier is non-NULL (in the submodule case) it
-		 * will be a SHA1 that needs to be copied.
-		 */
 	case GREP_SOURCE_OID:
 		gs->identifier = oiddup(identifier);
 		break;
@@ -1959,7 +1949,6 @@ void grep_source_clear_data(struct grep_source *gs)
 	switch (gs->type) {
 	case GREP_SOURCE_FILE:
 	case GREP_SOURCE_OID:
-	case GREP_SOURCE_SUBMODULE:
 		FREE_AND_NULL(gs->buf);
 		gs->size = 0;
 		break;
@@ -2030,8 +2019,6 @@ static int grep_source_load(struct grep_source *gs)
 		return grep_source_load_oid(gs);
 	case GREP_SOURCE_BUF:
 		return gs->buf ? 0 : -1;
-	case GREP_SOURCE_SUBMODULE:
-		break;
 	}
 	die("BUG: invalid grep_source type to load");
 }
diff --git a/grep.h b/grep.h
index 0c091e510..52aecfab6 100644
--- a/grep.h
+++ b/grep.h
@@ -193,7 +193,6 @@ struct grep_source {
 		GREP_SOURCE_OID,
 		GREP_SOURCE_FILE,
 		GREP_SOURCE_BUF,
-		GREP_SOURCE_SUBMODULE,
 	} type;
 	void *identifier;
 
diff --git a/hash.h b/hash.h
index bef3e630a..024d0d3d5 100644
--- a/hash.h
+++ b/hash.h
@@ -8,11 +8,7 @@
 #elif defined(SHA1_OPENSSL)
 #include <openssl/sha.h>
 #elif defined(SHA1_DC)
-#ifdef DC_SHA1_SUBMODULE
-#include "sha1collisiondetection/lib/sha1.h"
-#else
-#include "sha1dc/sha1.h"
-#endif
+#include "sha1dc_git.h"
 #else /* SHA1_BLK */
 #include "block-sha1/sha1.h"
 #endif
diff --git a/hashmap.c b/hashmap.c
index 9b6a12859..d42f01ff5 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -116,9 +116,6 @@ static void rehash(struct hashmap *map, unsigned int newsize)
 	unsigned int i, oldsize = map->tablesize;
 	struct hashmap_entry **oldtable = map->table;
 
-	if (map->disallow_rehash)
-		return;
-
 	alloc_table(map, newsize);
 	for (i = 0; i < oldsize; i++) {
 		struct hashmap_entry *e = oldtable[i];
@@ -166,6 +163,12 @@ void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function,
 	while (initial_size > size)
 		size <<= HASHMAP_RESIZE_BITS;
 	alloc_table(map, size);
+
+	/*
+	 * Keep track of the number of items in the map and
+	 * allow the map to automatically grow as necessary.
+	 */
+	map->do_count_items = 1;
 }
 
 void hashmap_free(struct hashmap *map, int free_entries)
@@ -206,9 +209,11 @@ void hashmap_add(struct hashmap *map, void *entry)
 	map->table[b] = entry;
 
 	/* fix size and rehash if appropriate */
-	map->size++;
-	if (map->size > map->grow_at)
-		rehash(map, map->tablesize << HASHMAP_RESIZE_BITS);
+	if (map->do_count_items) {
+		map->private_size++;
+		if (map->private_size > map->grow_at)
+			rehash(map, map->tablesize << HASHMAP_RESIZE_BITS);
+	}
 }
 
 void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata)
@@ -224,9 +229,12 @@ void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata)
 	old->next = NULL;
 
 	/* fix size and rehash if appropriate */
-	map->size--;
-	if (map->size < map->shrink_at)
-		rehash(map, map->tablesize >> HASHMAP_RESIZE_BITS);
+	if (map->do_count_items) {
+		map->private_size--;
+		if (map->private_size < map->shrink_at)
+			rehash(map, map->tablesize >> HASHMAP_RESIZE_BITS);
+	}
+
 	return old;
 }
 
diff --git a/hashmap.h b/hashmap.h
index 7a8fa7fa3..7cb29a6ae 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -183,7 +183,7 @@ struct hashmap {
 	const void *cmpfn_data;
 
 	/* total number of entries (0 means the hashmap is empty) */
-	unsigned int size;
+	unsigned int private_size; /* use hashmap_get_size() */
 
 	/*
 	 * tablesize is the allocated size of the hash table. A non-0 value
@@ -196,8 +196,7 @@ struct hashmap {
 	unsigned int grow_at;
 	unsigned int shrink_at;
 
-	/* See `hashmap_disallow_rehash`. */
-	unsigned disallow_rehash : 1;
+	unsigned int do_count_items : 1;
 };
 
 /* hashmap functions */
@@ -253,6 +252,18 @@ static inline void hashmap_entry_init(void *entry, unsigned int hash)
 }
 
 /*
+ * Return the number of items in the map.
+ */
+static inline unsigned int hashmap_get_size(struct hashmap *map)
+{
+	if (map->do_count_items)
+		return map->private_size;
+
+	BUG("hashmap_get_size: size not set");
+	return 0;
+}
+
+/*
  * Returns the hashmap entry for the specified key, or NULL if not found.
  *
  * `map` is the hashmap structure.
@@ -345,24 +356,6 @@ extern void *hashmap_remove(struct hashmap *map, const void *key,
 int hashmap_bucket(const struct hashmap *map, unsigned int hash);
 
 /*
- * Disallow/allow rehashing of the hashmap.
- * This is useful if the caller knows that the hashmap needs multi-threaded
- * access.  The caller is still required to guard/lock searches and inserts
- * in a manner appropriate to their usage.  This simply prevents the table
- * from being unexpectedly re-mapped.
- *
- * It is up to the caller to ensure that the hashmap is initialized to a
- * reasonable size to prevent poor performance.
- *
- * A call to allow rehashing does not force a rehash; that might happen
- * with the next insert or delete.
- */
-static inline void hashmap_disallow_rehash(struct hashmap *map, unsigned value)
-{
-	map->disallow_rehash = value;
-}
-
-/*
  * Used to iterate over all entries of a hashmap. Note that it is
  * not safe to add or remove entries to the hashmap while
  * iterating.
@@ -387,6 +380,43 @@ static inline void *hashmap_iter_first(struct hashmap *map,
 	return hashmap_iter_next(iter);
 }
 
+/*
+ * Disable item counting and automatic rehashing when adding/removing items.
+ *
+ * Normally, the hashmap keeps track of the number of items in the map
+ * and uses it to dynamically resize it.  This (both the counting and
+ * the resizing) can cause problems when the map is being used by
+ * threaded callers (because the hashmap code does not know about the
+ * locking strategy used by the threaded callers and therefore, does
+ * not know how to protect the "private_size" counter).
+ */
+static inline void hashmap_disable_item_counting(struct hashmap *map)
+{
+	map->do_count_items = 0;
+}
+
+/*
+ * Re-enable item couting when adding/removing items.
+ * If counting is currently disabled, it will force count them.
+ * It WILL NOT automatically rehash them.
+ */
+static inline void hashmap_enable_item_counting(struct hashmap *map)
+{
+	void *item;
+	unsigned int n = 0;
+	struct hashmap_iter iter;
+
+	if (map->do_count_items)
+		return;
+
+	hashmap_iter_init(map, &iter);
+	while ((item = hashmap_iter_next(&iter)))
+		n++;
+
+	map->do_count_items = 1;
+	map->private_size = n;
+}
+
 /* String interning */
 
 /*
diff --git a/http-backend.c b/http-backend.c
index 519025d2c..f3dc218b2 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -9,6 +9,7 @@
 #include "string-list.h"
 #include "url.h"
 #include "argv-array.h"
+#include "packfile.h"
 
 static const char content_type[] = "Content-Type";
 static const char content_length[] = "Content-Length";
@@ -357,7 +358,7 @@ static void inflate_request(const char *prog_name, int out, int buffer_input)
 				die("zlib error inflating request, result %d", ret);
 
 			n = stream.total_out - cnt;
-			if (write_in_full(out, out_buf, n) != n)
+			if (write_in_full(out, out_buf, n) < 0)
 				die("%s aborted reading request", prog_name);
 			cnt += n;
 
@@ -378,7 +379,7 @@ static void copy_request(const char *prog_name, int out)
 	ssize_t n = read_request(0, &buf);
 	if (n < 0)
 		die_errno("error reading request body");
-	if (write_in_full(out, buf, n) != n)
+	if (write_in_full(out, buf, n) < 0)
 		die("%s aborted reading request", prog_name);
 	close(out);
 	free(buf);
@@ -485,10 +486,9 @@ static int show_head_ref(const char *refname, const struct object_id *oid,
 	struct strbuf *buf = cb_data;
 
 	if (flag & REF_ISSYMREF) {
-		struct object_id unused;
 		const char *target = resolve_ref_unsafe(refname,
 							RESOLVE_REF_READING,
-							unused.hash, NULL);
+							NULL, NULL);
 
 		if (target)
 			strbuf_addf(buf, "ref: %s\n", strip_namespace(target));
diff --git a/http-push.c b/http-push.c
index df969609b..493ee7d71 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,6 +11,7 @@
 #include "list-objects.h"
 #include "sigchain.h"
 #include "argv-array.h"
+#include "packfile.h"
 
 #ifdef EXPAT_NEEDS_XMLPARSE_H
 #include <xmlparse.h>
@@ -1522,6 +1523,7 @@ static int remote_exists(const char *path)
 		break;
 	case HTTP_ERROR:
 		error("unable to access '%s': %s", url, curl_errorstr);
+		/* fallthrough */
 	default:
 		ret = -1;
 	}
diff --git a/http-walker.c b/http-walker.c
index ee049cb13..1ae8363de 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -4,6 +4,7 @@
 #include "http.h"
 #include "list.h"
 #include "transport.h"
+#include "packfile.h"
 
 struct alt_base {
 	char *base;
diff --git a/http.c b/http.c
index 76ff63c14..713525f38 100644
--- a/http.c
+++ b/http.c
@@ -11,6 +11,7 @@
 #include "pkt-line.h"
 #include "gettext.h"
 #include "transport.h"
+#include "packfile.h"
 
 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
 #if LIBCURL_VERSION_NUM >= 0x070a08
@@ -91,7 +92,7 @@ static struct {
 	 * here, too
 	 */
 };
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
 static const char *curl_deleg;
 static struct {
 	const char *name;
@@ -352,7 +353,7 @@ static int http_options(const char *var, const char *value, void *cb)
 	}
 
 	if (!strcmp("http.delegation", var)) {
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
 		return git_config_string(&curl_deleg, var, value);
 #else
 		warning(_("Delegation control is not supported with cURL < 7.22.0"));
@@ -637,9 +638,7 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
 	switch (type) {
 	case CURLINFO_TEXT:
 		trace_printf_key(&trace_curl, "== Info: %s", data);
-	default:		/* we ignore unknown types by default */
-		return 0;
-
+		break;
 	case CURLINFO_HEADER_OUT:
 		text = "=> Send header";
 		curl_dump_header(text, (unsigned char *)data, size, DO_FILTER);
@@ -664,6 +663,9 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
 		text = "<= Recv SSL data";
 		curl_dump_data(text, (unsigned char *)data, size);
 		break;
+
+	default:		/* we ignore unknown types by default */
+		return 0;
 	}
 	return 0;
 }
@@ -677,6 +679,7 @@ void setup_curl_trace(CURL *handle)
 	curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
 }
 
+#ifdef CURLPROTO_HTTP
 static long get_curl_allowed_protocols(int from_user)
 {
 	long allowed_protocols = 0;
@@ -692,6 +695,7 @@ static long get_curl_allowed_protocols(int from_user)
 
 	return allowed_protocols;
 }
+#endif
 
 static CURL *get_curl_handle(void)
 {
@@ -717,7 +721,7 @@ static CURL *get_curl_handle(void)
 	curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
 	if (curl_deleg) {
 		int i;
 		for (i = 0; i < ARRAY_SIZE(curl_deleg_levels); i++) {
@@ -790,7 +794,7 @@ static CURL *get_curl_handle(void)
 #elif LIBCURL_VERSION_NUM >= 0x071101
 	curl_easy_setopt(result, CURLOPT_POST301, 1);
 #endif
-#if LIBCURL_VERSION_NUM >= 0x071304
+#ifdef CURLPROTO_HTTP
 	curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
 			 get_curl_allowed_protocols(0));
 	curl_easy_setopt(result, CURLOPT_PROTOCOLS,
diff --git a/imap-send.c b/imap-send.c
index b2d0b849b..8c785f3ca 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -35,11 +35,11 @@ typedef void *SSL;
 #include "http.h"
 #endif
 
-#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL)
-/* only available option */
+#if defined(USE_CURL_FOR_IMAP_SEND)
+/* Always default to curl if it's available. */
 #define USE_CURL_DEFAULT 1
 #else
-/* strictly opt in */
+/* We don't have curl, so continue to use the historical implementation */
 #define USE_CURL_DEFAULT 0
 #endif
 
@@ -926,6 +926,25 @@ static int auth_cram_md5(struct imap_store *ctx, struct imap_cmd *cmd, const cha
 	return 0;
 }
 
+static void server_fill_credential(struct imap_server_conf *srvc, struct credential *cred)
+{
+	if (srvc->user && srvc->pass)
+		return;
+
+	cred->protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
+	cred->host = xstrdup(srvc->host);
+
+	cred->username = xstrdup_or_null(srvc->user);
+	cred->password = xstrdup_or_null(srvc->pass);
+
+	credential_fill(cred);
+
+	if (!srvc->user)
+		srvc->user = xstrdup(cred->username);
+	if (!srvc->pass)
+		srvc->pass = xstrdup(cred->password);
+}
+
 static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *folder)
 {
 	struct credential cred = CREDENTIAL_INIT;
@@ -1078,20 +1097,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 		}
 #endif
 		imap_info("Logging in...\n");
-		if (!srvc->user || !srvc->pass) {
-			cred.protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
-			cred.host = xstrdup(srvc->host);
-
-			cred.username = xstrdup_or_null(srvc->user);
-			cred.password = xstrdup_or_null(srvc->pass);
-
-			credential_fill(&cred);
-
-			if (!srvc->user)
-				srvc->user = xstrdup(cred.username);
-			if (!srvc->pass)
-				srvc->pass = xstrdup(cred.password);
-		}
+		server_fill_credential(srvc, &cred);
 
 		if (srvc->auth_method) {
 			struct imap_cmd_cb cb;
@@ -1392,7 +1398,7 @@ static int append_msgs_to_imap(struct imap_server_conf *server,
 }
 
 #ifdef USE_CURL_FOR_IMAP_SEND
-static CURL *setup_curl(struct imap_server_conf *srvc)
+static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
 {
 	CURL *curl;
 	struct strbuf path = STRBUF_INIT;
@@ -1405,6 +1411,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
 	if (!curl)
 		die("curl_easy_init failed");
 
+	server_fill_credential(&server, cred);
 	curl_easy_setopt(curl, CURLOPT_USERNAME, server.user);
 	curl_easy_setopt(curl, CURLOPT_PASSWORD, server.pass);
 
@@ -1454,8 +1461,9 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 	struct buffer msgbuf = { STRBUF_INIT, 0 };
 	CURL *curl;
 	CURLcode res = CURLE_OK;
+	struct credential cred = CREDENTIAL_INIT;
 
-	curl = setup_curl(server);
+	curl = setup_curl(server, &cred);
 	curl_easy_setopt(curl, CURLOPT_READDATA, &msgbuf);
 
 	fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");
@@ -1490,7 +1498,20 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 	curl_easy_cleanup(curl);
 	curl_global_cleanup();
 
-	return 0;
+	if (cred.username) {
+		if (res == CURLE_OK)
+			credential_approve(&cred);
+#if LIBCURL_VERSION_NUM >= 0x070d01
+		else if (res == CURLE_LOGIN_DENIED)
+#else
+		else
+#endif
+			credential_reject(&cred);
+	}
+
+	credential_clear(&cred);
+
+	return res != CURLE_OK;
 }
 #endif
 
diff --git a/line-log.c b/line-log.c
index ab0709f9a..545ad0f28 100644
--- a/line-log.c
+++ b/line-log.c
@@ -90,7 +90,7 @@ static int range_cmp(const void *_r, const void *_s)
  */
 static void range_set_check_invariants(struct range_set *rs)
 {
-	int i;
+	unsigned int i;
 
 	if (!rs)
 		return;
@@ -110,8 +110,8 @@ static void range_set_check_invariants(struct range_set *rs)
  */
 void sort_and_merge_range_set(struct range_set *rs)
 {
-	int i;
-	int o = 0; /* output cursor */
+	unsigned int i;
+	unsigned int o = 0; /* output cursor */
 
 	QSORT(rs->ranges, rs->nr, range_cmp);
 
@@ -144,7 +144,7 @@ void sort_and_merge_range_set(struct range_set *rs)
 static void range_set_union(struct range_set *out,
 			     struct range_set *a, struct range_set *b)
 {
-	int i = 0, j = 0;
+	unsigned int i = 0, j = 0;
 	struct range *ra = a->ranges;
 	struct range *rb = b->ranges;
 	/* cannot make an alias of out->ranges: it may change during grow */
@@ -186,7 +186,7 @@ static void range_set_union(struct range_set *out,
 static void range_set_difference(struct range_set *out,
 				  struct range_set *a, struct range_set *b)
 {
-	int i, j =  0;
+	unsigned int i, j =  0;
 	for (i = 0; i < a->nr; i++) {
 		long start = a->ranges[i].start;
 		long end = a->ranges[i].end;
@@ -397,7 +397,7 @@ static void diff_ranges_filter_touched(struct diff_ranges *out,
 				       struct diff_ranges *diff,
 				       struct range_set *rs)
 {
-	int i, j = 0;
+	unsigned int i, j = 0;
 
 	assert(out->target.nr == 0);
 
@@ -426,7 +426,7 @@ static void range_set_shift_diff(struct range_set *out,
 				 struct range_set *rs,
 				 struct diff_ranges *diff)
 {
-	int i, j = 0;
+	unsigned int i, j = 0;
 	long offset = 0;
 	struct range *src = rs->ranges;
 	struct range *target = diff->target.ranges;
@@ -873,7 +873,7 @@ static char *output_prefix(struct diff_options *opt)
 
 static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
 {
-	int i, j = 0;
+	unsigned int i, j = 0;
 	long p_lines, t_lines;
 	unsigned long *p_ends = NULL, *t_ends = NULL;
 	struct diff_filepair *pair = range->pair;
@@ -906,7 +906,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
 		long t_start = range->ranges.ranges[i].start;
 		long t_end = range->ranges.ranges[i].end;
 		long t_cur = t_start;
-		int j_last;
+		unsigned int j_last;
 
 		while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
 			j++;
diff --git a/line-log.h b/line-log.h
index 7a5c24e2d..e2a5ee7c6 100644
--- a/line-log.h
+++ b/line-log.h
@@ -14,7 +14,7 @@ struct range {
 
 /* A set of ranges.  The ranges must always be disjoint and sorted. */
 struct range_set {
-	int alloc, nr;
+	unsigned int alloc, nr;
 	struct range *ranges;
 };
 
diff --git a/list.h b/list.h
index a226a870d..eb601192f 100644
--- a/list.h
+++ b/list.h
@@ -163,4 +163,42 @@ static inline void list_replace_init(struct list_head *old,
 	INIT_LIST_HEAD(old);
 }
 
+/*
+ * This is exactly the same as a normal list_head, except that it can be
+ * declared volatile (e.g., if you have a list that may be accessed from signal
+ * handlers).
+ */
+struct volatile_list_head {
+	volatile struct volatile_list_head *next, *prev;
+};
+
+#define VOLATILE_LIST_HEAD(name) \
+	volatile struct volatile_list_head name = { &(name), &(name) }
+
+static inline void __volatile_list_del(volatile struct volatile_list_head *prev,
+				       volatile struct volatile_list_head *next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+static inline void volatile_list_del(volatile struct volatile_list_head *elem)
+{
+	__volatile_list_del(elem->prev, elem->next);
+}
+
+static inline int volatile_list_empty(volatile struct volatile_list_head *head)
+{
+	return head == head->next;
+}
+
+static inline void volatile_list_add(volatile struct volatile_list_head *newp,
+				     volatile struct volatile_list_head *head)
+{
+	head->next->prev = newp;
+	newp->next = head->next;
+	newp->prev = head;
+	head->next = newp;
+}
+
 #endif /* LIST_H */
diff --git a/ll-merge.c b/ll-merge.c
index 9fb855a90..a6ad2ec12 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -154,7 +154,7 @@ static void create_temp(mmfile_t *src, char *path, size_t len)
 
 	xsnprintf(path, len, ".merge_file_XXXXXX");
 	fd = xmkstemp(path);
-	if (write_in_full(fd, src->ptr, src->size) != src->size)
+	if (write_in_full(fd, src->ptr, src->size) < 0)
 		die_errno("unable to write temp-file");
 	close(fd);
 }
diff --git a/lockfile.c b/lockfile.c
index aa69210d8..efcb7d7df 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -72,7 +72,6 @@ static void resolve_symlink(struct strbuf *path)
 /* Make sure errno contains a meaningful value on error */
 static int lock_file(struct lock_file *lk, const char *path, int flags)
 {
-	int fd;
 	struct strbuf filename = STRBUF_INIT;
 
 	strbuf_addstr(&filename, path);
@@ -80,9 +79,9 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 		resolve_symlink(&filename);
 
 	strbuf_addstr(&filename, LOCK_SUFFIX);
-	fd = create_tempfile(&lk->tempfile, filename.buf);
+	lk->tempfile = create_tempfile(filename.buf);
 	strbuf_release(&filename);
-	return fd;
+	return lk->tempfile ? lk->tempfile->fd : -1;
 }
 
 /*
@@ -191,7 +190,7 @@ char *get_locked_file_path(struct lock_file *lk)
 {
 	struct strbuf ret = STRBUF_INIT;
 
-	strbuf_addstr(&ret, get_tempfile_path(&lk->tempfile));
+	strbuf_addstr(&ret, get_tempfile_path(lk->tempfile));
 	if (ret.len <= LOCK_SUFFIX_LEN ||
 	    strcmp(ret.buf + ret.len - LOCK_SUFFIX_LEN, LOCK_SUFFIX))
 		die("BUG: get_locked_file_path() called for malformed lock object");
diff --git a/lockfile.h b/lockfile.h
index 572064939..7c1c484d7 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -37,12 +37,12 @@
  *
  * The caller:
  *
- * * Allocates a `struct lock_file` either as a static variable or on
- *   the heap, initialized to zeros. Once you use the structure to
- *   call the `hold_lock_file_for_*()` family of functions, it belongs
- *   to the lockfile subsystem and its storage must remain valid
- *   throughout the life of the program (i.e. you cannot use an
- *   on-stack variable to hold this structure).
+ * * Allocates a `struct lock_file` with whatever storage duration you
+ *   desire. The struct does not have to be initialized before being
+ *   used, but it is good practice to do so using by setting it to
+ *   all-zeros (or using the LOCK_INIT macro). This puts the object in a
+ *   consistent state that allows you to call rollback_lock_file() even
+ *   if the lock was never taken (in which case it is a noop).
  *
  * * Attempts to create a lockfile by calling `hold_lock_file_for_update()`.
  *
@@ -69,14 +69,12 @@
  *   `rollback_lock_file()`.
  *
  * * Close the file descriptor without removing or renaming the
- *   lockfile by calling `close_lock_file()`, and later call
+ *   lockfile by calling `close_lock_file_gently()`, and later call
  *   `commit_lock_file()`, `commit_lock_file_to()`,
  *   `rollback_lock_file()`, or `reopen_lock_file()`.
  *
- * Even after the lockfile is committed or rolled back, the
- * `lock_file` object must not be freed or altered by the caller.
- * However, it may be reused; just pass it to another call of
- * `hold_lock_file_for_update()`.
+ * After the lockfile is committed or rolled back, the `lock_file`
+ * object can be discarded or reused.
  *
  * If the program exits before `commit_lock_file()`,
  * `commit_lock_file_to()`, or `rollback_lock_file()` is called, the
@@ -85,7 +83,7 @@
  *
  * If you need to close the file descriptor you obtained from a
  * `hold_lock_file_for_*()` function yourself, do so by calling
- * `close_lock_file()`. See "tempfile.h" for more information.
+ * `close_lock_file_gently()`. See "tempfile.h" for more information.
  *
  *
  * Under the covers, a lockfile is just a tempfile with a few helper
@@ -104,16 +102,18 @@
  *
  * Similarly, `commit_lock_file`, `commit_lock_file_to`, and
  * `close_lock_file` return 0 on success. On failure they set `errno`
- * appropriately, do their best to roll back the lockfile, and return
- * -1.
+ * appropriately and return -1. The `commit` variants (but not `close`)
+ * do their best to delete the temporary file before returning.
  */
 
 #include "tempfile.h"
 
 struct lock_file {
-	struct tempfile tempfile;
+	struct tempfile *tempfile;
 };
 
+#define LOCK_INIT { NULL }
+
 /* String appended to a filename to derive the lockfile name: */
 #define LOCK_SUFFIX ".lock"
 #define LOCK_SUFFIX_LEN 5
@@ -180,7 +180,7 @@ static inline int hold_lock_file_for_update(
  */
 static inline int is_lock_file_locked(struct lock_file *lk)
 {
-	return is_tempfile_active(&lk->tempfile);
+	return is_tempfile_active(lk->tempfile);
 }
 
 /*
@@ -202,12 +202,13 @@ extern NORETURN void unable_to_lock_die(const char *path, int err);
 /*
  * Associate a stdio stream with the lockfile (which must still be
  * open). Return `NULL` (*without* rolling back the lockfile) on
- * error. The stream is closed automatically when `close_lock_file()`
- * is called or when the file is committed or rolled back.
+ * error. The stream is closed automatically when
+ * `close_lock_file_gently()` is called or when the file is committed or
+ * rolled back.
  */
 static inline FILE *fdopen_lock_file(struct lock_file *lk, const char *mode)
 {
-	return fdopen_tempfile(&lk->tempfile, mode);
+	return fdopen_tempfile(lk->tempfile, mode);
 }
 
 /*
@@ -216,17 +217,17 @@ static inline FILE *fdopen_lock_file(struct lock_file *lk, const char *mode)
  */
 static inline const char *get_lock_file_path(struct lock_file *lk)
 {
-	return get_tempfile_path(&lk->tempfile);
+	return get_tempfile_path(lk->tempfile);
 }
 
 static inline int get_lock_file_fd(struct lock_file *lk)
 {
-	return get_tempfile_fd(&lk->tempfile);
+	return get_tempfile_fd(lk->tempfile);
 }
 
 static inline FILE *get_lock_file_fp(struct lock_file *lk)
 {
-	return get_tempfile_fp(&lk->tempfile);
+	return get_tempfile_fp(lk->tempfile);
 }
 
 /*
@@ -241,22 +242,21 @@ extern char *get_locked_file_path(struct lock_file *lk);
  * lockfile over the file being locked. Return 0 upon success. On
  * failure to `close(2)`, return a negative value and roll back the
  * lock file. Usually `commit_lock_file()`, `commit_lock_file_to()`,
- * or `rollback_lock_file()` should eventually be called if
- * `close_lock_file()` succeeds.
+ * or `rollback_lock_file()` should eventually be called.
  */
-static inline int close_lock_file(struct lock_file *lk)
+static inline int close_lock_file_gently(struct lock_file *lk)
 {
-	return close_tempfile(&lk->tempfile);
+	return close_tempfile_gently(lk->tempfile);
 }
 
 /*
- * Re-open a lockfile that has been closed using `close_lock_file()`
+ * Re-open a lockfile that has been closed using `close_lock_file_gently()`
  * but not yet committed or rolled back. This can be used to implement
  * a sequence of operations like the following:
  *
  * * Lock file.
  *
- * * Write new contents to lockfile, then `close_lock_file()` to
+ * * Write new contents to lockfile, then `close_lock_file_gently()` to
  *   cause the contents to be written to disk.
  *
  * * Pass the name of the lockfile to another program to allow it (and
@@ -270,7 +270,7 @@ static inline int close_lock_file(struct lock_file *lk)
  */
 static inline int reopen_lock_file(struct lock_file *lk)
 {
-	return reopen_tempfile(&lk->tempfile);
+	return reopen_tempfile(lk->tempfile);
 }
 
 /*
diff --git a/log-tree.c b/log-tree.c
index 410ab4f02..cea056234 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -185,7 +185,6 @@ static const struct name_decoration *current_pointed_by_HEAD(const struct name_d
 {
 	const struct name_decoration *list, *head = NULL;
 	const char *branch_name = NULL;
-	struct object_id unused;
 	int rru_flags;
 
 	/* First find HEAD */
@@ -198,7 +197,7 @@ static const struct name_decoration *current_pointed_by_HEAD(const struct name_d
 		return NULL;
 
 	/* Now resolve and find the matching current branch */
-	branch_name = resolve_ref_unsafe("HEAD", 0, unused.hash, &rru_flags);
+	branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags);
 	if (!(rru_flags & REF_ISSYMREF))
 		return NULL;
 
diff --git a/mailinfo.c b/mailinfo.c
index 70187e3eb..a89db22ab 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -149,16 +149,14 @@ static void handle_from(struct mailinfo *mi, const struct strbuf *from)
 	at = strchr(f.buf, '@');
 	if (!at) {
 		parse_bogus_from(mi, from);
-		return;
+		goto out;
 	}
 
 	/*
 	 * If we already have one email, don't take any confusing lines
 	 */
-	if (mi->email.len && strchr(at + 1, '@')) {
-		strbuf_release(&f);
-		return;
-	}
+	if (mi->email.len && strchr(at + 1, '@'))
+		goto out;
 
 	/* Pick up the string around '@', possibly delimited with <>
 	 * pair; that is the email part.
@@ -198,6 +196,7 @@ static void handle_from(struct mailinfo *mi, const struct strbuf *from)
 	}
 
 	get_sane_name(&mi->name, &f, &mi->email);
+out:
 	strbuf_release(&f);
 }
 
@@ -828,6 +827,7 @@ static void handle_filter(struct mailinfo *mi, struct strbuf *line)
 		if (!handle_commit_msg(mi, line))
 			break;
 		mi->filter_stage++;
+		/* fallthrough */
 	case 1:
 		handle_patch(mi, line);
 		break;
@@ -934,6 +934,7 @@ again:
 			error("Detected mismatched boundaries, can't recover");
 			mi->input_error = -1;
 			mi->content_top = mi->content;
+			strbuf_release(&newline);
 			return 0;
 		}
 		handle_filter(mi, &newline);
diff --git a/mailmap.c b/mailmap.c
index c1a79c100..cb921b4db 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
 			     const char *name,
 			     char **repo_abbrev)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	char *buf;
 	unsigned long size;
 	enum object_type type;
 
 	if (!name)
 		return 0;
-	if (get_sha1(name, sha1) < 0)
+	if (get_oid(name, &oid) < 0)
 		return 0;
 
-	buf = read_sha1_file(sha1, &type, &size);
+	buf = read_sha1_file(oid.hash, &type, &size);
 	if (!buf)
 		return error("unable to read mailmap object at %s", name);
 	if (type != OBJ_BLOB)
diff --git a/merge-recursive.c b/merge-recursive.c
index 1494ffdb8..1d3f8f0d2 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -24,6 +24,31 @@
 #include "dir.h"
 #include "submodule.h"
 
+struct path_hashmap_entry {
+	struct hashmap_entry e;
+	char path[FLEX_ARRAY];
+};
+
+static int path_hashmap_cmp(const void *cmp_data,
+			    const void *entry,
+			    const void *entry_or_key,
+			    const void *keydata)
+{
+	const struct path_hashmap_entry *a = entry;
+	const struct path_hashmap_entry *b = entry_or_key;
+	const char *key = keydata;
+
+	if (ignore_case)
+		return strcasecmp(a->path, key ? key : b->path);
+	else
+		return strcmp(a->path, key ? key : b->path);
+}
+
+static unsigned int path_hash(const char *path)
+{
+	return ignore_case ? strihash(path) : strhash(path);
+}
+
 static void flush_output(struct merge_options *o)
 {
 	if (o->buffer_output < 2 && o->obuf.len) {
@@ -314,29 +339,25 @@ static int save_files_dirs(const unsigned char *sha1,
 		struct strbuf *base, const char *path,
 		unsigned int mode, int stage, void *context)
 {
+	struct path_hashmap_entry *entry;
 	int baselen = base->len;
 	struct merge_options *o = context;
 
 	strbuf_addstr(base, path);
 
-	if (S_ISDIR(mode))
-		string_list_insert(&o->current_directory_set, base->buf);
-	else
-		string_list_insert(&o->current_file_set, base->buf);
+	FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
+	hashmap_entry_init(entry, path_hash(entry->path));
+	hashmap_add(&o->current_file_dir_set, entry);
 
 	strbuf_setlen(base, baselen);
 	return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
 }
 
-static int get_files_dirs(struct merge_options *o, struct tree *tree)
+static void get_files_dirs(struct merge_options *o, struct tree *tree)
 {
-	int n;
 	struct pathspec match_all;
 	memset(&match_all, 0, sizeof(match_all));
-	if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
-		return 0;
-	n = o->current_file_set.nr + o->current_directory_set.nr;
-	return n;
+	read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
 }
 
 /*
@@ -646,6 +667,7 @@ static void add_flattened_path(struct strbuf *out, const char *s)
 
 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
 {
+	struct path_hashmap_entry *entry;
 	struct strbuf newpath = STRBUF_INIT;
 	int suffix = 0;
 	size_t base_len;
@@ -654,14 +676,16 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
 	add_flattened_path(&newpath, branch);
 
 	base_len = newpath.len;
-	while (string_list_has_string(&o->current_file_set, newpath.buf) ||
-	       string_list_has_string(&o->current_directory_set, newpath.buf) ||
+	while (hashmap_get_from_hash(&o->current_file_dir_set,
+				     path_hash(newpath.buf), newpath.buf) ||
 	       (!o->call_depth && file_exists(newpath.buf))) {
 		strbuf_setlen(&newpath, base_len);
 		strbuf_addf(&newpath, "_%d", suffix++);
 	}
 
-	string_list_insert(&o->current_file_set, newpath.buf);
+	FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
+	hashmap_entry_init(entry, path_hash(entry->path));
+	hashmap_add(&o->current_file_dir_set, entry);
 	return strbuf_detach(&newpath, NULL);
 }
 
@@ -1927,7 +1951,7 @@ int merge_trees(struct merge_options *o,
 	}
 
 	if (oid_eq(&common->object.oid, &merge->object.oid)) {
-		output(o, 0, _("Already up-to-date!"));
+		output(o, 0, _("Already up to date!"));
 		*result = head;
 		return 1;
 	}
@@ -1945,8 +1969,14 @@ int merge_trees(struct merge_options *o,
 	if (unmerged_cache()) {
 		struct string_list *entries, *re_head, *re_merge;
 		int i;
-		string_list_clear(&o->current_file_set, 1);
-		string_list_clear(&o->current_directory_set, 1);
+		/*
+		 * Only need the hashmap while processing entries, so
+		 * initialize it here and free it when we are done running
+		 * through the entries. Keeping it in the merge_options as
+		 * opposed to decaring a local hashmap is for convenience
+		 * so that we don't have to pass it to around.
+		 */
+		hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
 		get_files_dirs(o, head);
 		get_files_dirs(o, merge);
 
@@ -1956,7 +1986,7 @@ int merge_trees(struct merge_options *o,
 		re_merge = get_renames(o, merge, common, head, merge, entries);
 		clean = process_renames(o, re_head, re_merge);
 		if (clean < 0)
-			return clean;
+			goto cleanup;
 		for (i = entries->nr-1; 0 <= i; i--) {
 			const char *path = entries->items[i].string;
 			struct stage_data *e = entries->items[i].util;
@@ -1964,8 +1994,10 @@ int merge_trees(struct merge_options *o,
 				int ret = process_entry(o, path, e);
 				if (!ret)
 					clean = 0;
-				else if (ret < 0)
-					return ret;
+				else if (ret < 0) {
+					clean = ret;
+					goto cleanup;
+				}
 			}
 		}
 		for (i = 0; i < entries->nr; i++) {
@@ -1975,13 +2007,19 @@ int merge_trees(struct merge_options *o,
 				    entries->items[i].string);
 		}
 
+cleanup:
 		string_list_clear(re_merge, 0);
 		string_list_clear(re_head, 0);
 		string_list_clear(entries, 1);
 
+		hashmap_free(&o->current_file_dir_set, 1);
+
 		free(re_merge);
 		free(re_head);
 		free(entries);
+
+		if (clean < 0)
+			return clean;
 	}
 	else
 		clean = 1;
@@ -2177,8 +2215,6 @@ void init_merge_options(struct merge_options *o)
 	if (o->verbosity >= 5)
 		o->buffer_output = 0;
 	strbuf_init(&o->obuf, 0);
-	string_list_init(&o->current_file_set, 1);
-	string_list_init(&o->current_directory_set, 1);
 	string_list_init(&o->df_conflict_file_set, 1);
 }
 
diff --git a/merge-recursive.h b/merge-recursive.h
index 735343b41..80d69d140 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -25,8 +25,7 @@ struct merge_options {
 	int show_rename_progress;
 	int call_depth;
 	struct strbuf obuf;
-	struct string_list current_file_set;
-	struct string_list current_directory_set;
+	struct hashmap current_file_dir_set;
 	struct string_list df_conflict_file_set;
 };
 
diff --git a/name-hash.c b/name-hash.c
index 0e10f3eab..45c98db0a 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -17,10 +17,14 @@ struct dir_entry {
 };
 
 static int dir_entry_cmp(const void *unused_cmp_data,
-			 const struct dir_entry *e1,
-			 const struct dir_entry *e2,
-			 const char *name)
+			 const void *entry,
+			 const void *entry_or_key,
+			 const void *keydata)
 {
+	const struct dir_entry *e1 = entry;
+	const struct dir_entry *e2 = entry_or_key;
+	const char *name = keydata;
+
 	return e1->namelen != e2->namelen || strncasecmp(e1->name,
 			name ? name : e2->name, e1->namelen);
 }
@@ -110,10 +114,12 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
 }
 
 static int cache_entry_cmp(const void *unused_cmp_data,
-			   const struct cache_entry *ce1,
-			   const struct cache_entry *ce2,
+			   const void *entry,
+			   const void *entry_or_key,
 			   const void *remove)
 {
+	const struct cache_entry *ce1 = entry;
+	const struct cache_entry *ce2 = entry_or_key;
 	/*
 	 * For remove_name_hash, find the exact entry (pointer equality); for
 	 * index_file_exists, find all entries with matching hash code and
@@ -574,15 +580,19 @@ static void lazy_init_name_hash(struct index_state *istate)
 {
 	if (istate->name_hash_initialized)
 		return;
-	hashmap_init(&istate->name_hash, (hashmap_cmp_fn) cache_entry_cmp,
-			NULL, istate->cache_nr);
-	hashmap_init(&istate->dir_hash, (hashmap_cmp_fn) dir_entry_cmp,
-			NULL, istate->cache_nr);
+	hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
+	hashmap_init(&istate->dir_hash, dir_entry_cmp, NULL, istate->cache_nr);
 
 	if (lookup_lazy_params(istate)) {
-		hashmap_disallow_rehash(&istate->dir_hash, 1);
+		/*
+		 * Disable item counting and automatic rehashing because
+		 * we do per-chain (mod n) locking rather than whole hashmap
+		 * locking and we need to prevent the table-size from changing
+		 * and bucket items from being redistributed.
+		 */
+		hashmap_disable_item_counting(&istate->dir_hash);
 		threaded_lazy_init_name_hash(istate);
-		hashmap_disallow_rehash(&istate->dir_hash, 0);
+		hashmap_enable_item_counting(&istate->dir_hash);
 	} else {
 		int nr;
 		for (nr = 0; nr < istate->cache_nr; nr++)
diff --git a/notes-merge.c b/notes-merge.c
index c12b354f1..4352c34a6 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -302,14 +302,12 @@ static void write_buf_to_worktree(const struct object_id *obj,
 	fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
 
 	while (size > 0) {
-		long ret = write_in_full(fd, buf, size);
+		ssize_t ret = write_in_full(fd, buf, size);
 		if (ret < 0) {
 			/* Ignore epipe */
 			if (errno == EPIPE)
 				break;
 			die_errno("notes-merge");
-		} else if (!ret) {
-			die("notes-merge: disk full?");
 		}
 		size -= ret;
 		buf += ret;
@@ -624,7 +622,7 @@ int notes_merge(struct notes_merge_options *o,
 	if (!oidcmp(&remote->object.oid, base_oid)) {
 		/* Already merged; result == local commit */
 		if (o->verbosity >= 2)
-			printf("Already up-to-date!\n");
+			printf("Already up to date!\n");
 		oidcpy(result_oid, &local->object.oid);
 		goto found_result;
 	}
@@ -709,7 +707,7 @@ int notes_merge_commit(struct notes_merge_options *o,
 		/* write file as blob, and add to partial_tree */
 		if (stat(path.buf, &st))
 			die_errno("Failed to stat '%s'", path.buf);
-		if (index_path(blob_oid.hash, path.buf, &st, HASH_WRITE_OBJECT))
+		if (index_path(&blob_oid, path.buf, &st, HASH_WRITE_OBJECT))
 			die("Failed to write blob object from '%s'", path.buf);
 		if (add_note(partial_tree, &obj_oid, &blob_oid, NULL))
 			die("Failed to add resolved note '%s' to notes tree",
diff --git a/notes.c b/notes.c
index 8f47c202c..5c6286257 100644
--- a/notes.c
+++ b/notes.c
@@ -64,7 +64,7 @@ struct non_note {
 #define CLR_PTR_TYPE(ptr)       ((void *) ((uintptr_t) (ptr) & ~3))
 #define SET_PTR_TYPE(ptr, type) ((void *) ((uintptr_t) (ptr) | (type)))
 
-#define GET_NIBBLE(n, sha1) (((sha1[(n) >> 1]) >> ((~(n) & 0x01) << 2)) & 0x0f)
+#define GET_NIBBLE(n, sha1) ((((sha1)[(n) >> 1]) >> ((~(n) & 0x01) << 2)) & 0x0f)
 
 #define KEY_INDEX (GIT_SHA1_RAWSZ - 1)
 #define FANOUT_PATH_SEPARATORS ((GIT_SHA1_HEXSZ / 2) - 1)
@@ -335,31 +335,20 @@ static void note_tree_free(struct int_node *tree)
 }
 
 /*
- * Convert a partial SHA1 hex string to the corresponding partial SHA1 value.
- * - hex      - Partial SHA1 segment in ASCII hex format
- * - hex_len  - Length of above segment. Must be multiple of 2 between 0 and 40
- * - sha1     - Partial SHA1 value is written here
- * - sha1_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20
- * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format)).
- * Otherwise, returns number of bytes written to sha1 (i.e. hex_len / 2).
- * Pads sha1 with NULs up to sha1_len (not included in returned length).
+ * Read `len` pairs of hexadecimal digits from `hex` and write the
+ * values to `binary` as `len` bytes. Return 0 on success, or -1 if
+ * the input does not consist of hex digits).
  */
-static int get_oid_hex_segment(const char *hex, unsigned int hex_len,
-		unsigned char *oid, unsigned int oid_len)
+static int hex_to_bytes(unsigned char *binary, const char *hex, size_t len)
 {
-	unsigned int i, len = hex_len >> 1;
-	if (hex_len % 2 != 0 || len > oid_len)
-		return -1;
-	for (i = 0; i < len; i++) {
+	for (; len; len--, hex += 2) {
 		unsigned int val = (hexval(hex[0]) << 4) | hexval(hex[1]);
+
 		if (val & ~0xff)
 			return -1;
-		*oid++ = val;
-		hex += 2;
+		*binary++ = val;
 	}
-	for (; i < oid_len; i++)
-		*oid++ = 0;
-	return len;
+	return 0;
 }
 
 static int non_note_cmp(const struct non_note *a, const struct non_note *b)
@@ -417,80 +406,90 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
 		struct int_node *node, unsigned int n)
 {
 	struct object_id object_oid;
-	unsigned int prefix_len;
+	size_t prefix_len;
 	void *buf;
 	struct tree_desc desc;
 	struct name_entry entry;
-	int len, path_len;
-	unsigned char type;
-	struct leaf_node *l;
 
-	buf = fill_tree_descriptor(&desc, subtree->val_oid.hash);
+	buf = fill_tree_descriptor(&desc, &subtree->val_oid);
 	if (!buf)
 		die("Could not read %s for notes-index",
 		     oid_to_hex(&subtree->val_oid));
 
 	prefix_len = subtree->key_oid.hash[KEY_INDEX];
-	assert(prefix_len * 2 >= n);
+	if (prefix_len >= GIT_SHA1_RAWSZ)
+		BUG("prefix_len (%"PRIuMAX") is out of range", (uintmax_t)prefix_len);
+	if (prefix_len * 2 < n)
+		BUG("prefix_len (%"PRIuMAX") is too small", (uintmax_t)prefix_len);
 	memcpy(object_oid.hash, subtree->key_oid.hash, prefix_len);
 	while (tree_entry(&desc, &entry)) {
-		path_len = strlen(entry.path);
-		len = get_oid_hex_segment(entry.path, path_len,
-				object_oid.hash + prefix_len, GIT_SHA1_RAWSZ - prefix_len);
-		if (len < 0)
-			goto handle_non_note; /* entry.path is not a SHA1 */
-		len += prefix_len;
+		unsigned char type;
+		struct leaf_node *l;
+		size_t path_len = strlen(entry.path);
+
+		if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) {
+			/* This is potentially the remainder of the SHA-1 */
+
+			if (!S_ISREG(entry.mode))
+				/* notes must be blobs */
+				goto handle_non_note;
+
+			if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
+					 GIT_SHA1_RAWSZ - prefix_len))
+				goto handle_non_note; /* entry.path is not a SHA1 */
 
-		/*
-		 * If object SHA1 is complete (len == 20), assume note object
-		 * If object SHA1 is incomplete (len < 20), and current
-		 * component consists of 2 hex chars, assume note subtree
-		 */
-		if (len <= GIT_SHA1_RAWSZ) {
 			type = PTR_TYPE_NOTE;
-			l = (struct leaf_node *)
-				xcalloc(1, sizeof(struct leaf_node));
-			oidcpy(&l->key_oid, &object_oid);
-			oidcpy(&l->val_oid, entry.oid);
-			if (len < GIT_SHA1_RAWSZ) {
-				if (!S_ISDIR(entry.mode) || path_len != 2)
-					goto handle_non_note; /* not subtree */
-				l->key_oid.hash[KEY_INDEX] = (unsigned char) len;
-				type = PTR_TYPE_SUBTREE;
-			}
-			if (note_tree_insert(t, node, n, l, type,
-					     combine_notes_concatenate))
-				die("Failed to load %s %s into notes tree "
-				    "from %s",
-				    type == PTR_TYPE_NOTE ? "note" : "subtree",
-				    oid_to_hex(&l->key_oid), t->ref);
+		} else if (path_len == 2) {
+			/* This is potentially an internal node */
+			size_t len = prefix_len;
+
+			if (!S_ISDIR(entry.mode))
+				/* internal nodes must be trees */
+				goto handle_non_note;
+
+			if (hex_to_bytes(object_oid.hash + len++, entry.path, 1))
+				goto handle_non_note; /* entry.path is not a SHA1 */
+
+			/*
+			 * Pad the rest of the SHA-1 with zeros,
+			 * except for the last byte, where we write
+			 * the length:
+			 */
+			memset(object_oid.hash + len, 0, GIT_SHA1_RAWSZ - len - 1);
+			object_oid.hash[KEY_INDEX] = (unsigned char)len;
+
+			type = PTR_TYPE_SUBTREE;
+		} else {
+			/* This can't be part of a note */
+			goto handle_non_note;
 		}
+
+		l = xcalloc(1, sizeof(*l));
+		oidcpy(&l->key_oid, &object_oid);
+		oidcpy(&l->val_oid, entry.oid);
+		if (note_tree_insert(t, node, n, l, type,
+				     combine_notes_concatenate))
+			die("Failed to load %s %s into notes tree "
+			    "from %s",
+			    type == PTR_TYPE_NOTE ? "note" : "subtree",
+			    oid_to_hex(&l->key_oid), t->ref);
+
 		continue;
 
 handle_non_note:
 		/*
-		 * Determine full path for this non-note entry:
-		 * The filename is already found in entry.path, but the
-		 * directory part of the path must be deduced from the subtree
-		 * containing this entry. We assume here that the overall notes
-		 * tree follows a strict byte-based progressive fanout
-		 * structure (i.e. using 2/38, 2/2/36, etc. fanouts, and not
-		 * e.g. 4/36 fanout). This means that if a non-note is found at
-		 * path "dead/beef", the following code will register it as
-		 * being found on "de/ad/beef".
-		 * On the other hand, if you use such non-obvious non-note
-		 * paths in the middle of a notes tree, you deserve what's
-		 * coming to you ;). Note that for non-notes that are not
-		 * SHA1-like at the top level, there will be no problems.
-		 *
-		 * To conclude, it is strongly advised to make sure non-notes
-		 * have at least one non-hex character in the top-level path
-		 * component.
+		 * Determine full path for this non-note entry. The
+		 * filename is already found in entry.path, but the
+		 * directory part of the path must be deduced from the
+		 * subtree containing this entry based on our
+		 * knowledge that the overall notes tree follows a
+		 * strict byte-based progressive fanout structure
+		 * (i.e. using 2/38, 2/2/36, etc. fanouts).
 		 */
 		{
 			struct strbuf non_note_path = STRBUF_INIT;
 			const char *q = oid_to_hex(&subtree->key_oid);
-			int i;
+			size_t i;
 			for (i = 0; i < prefix_len; i++) {
 				strbuf_addch(&non_note_path, *q++);
 				strbuf_addch(&non_note_path, *q++);
@@ -1026,7 +1025,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
 	t->dirty = 0;
 
 	if (flags & NOTES_INIT_EMPTY || !notes_ref ||
-	    get_sha1_treeish(notes_ref, object_oid.hash))
+	    get_oid_treeish(notes_ref, &object_oid))
 		return;
 	if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, object_oid.hash))
 		die("Cannot use notes ref %s", notes_ref);
diff --git a/object.c b/object.c
index 321d7e920..b9a4a0e50 100644
--- a/object.c
+++ b/object.c
@@ -353,6 +353,19 @@ static void object_array_release_entry(struct object_array_entry *ent)
 	free(ent->path);
 }
 
+struct object *object_array_pop(struct object_array *array)
+{
+	struct object *ret;
+
+	if (!array->nr)
+		return NULL;
+
+	ret = array->objects[array->nr - 1].item;
+	object_array_release_entry(&array->objects[array->nr - 1]);
+	array->nr--;
+	return ret;
+}
+
 void object_array_filter(struct object_array *array,
 			 object_array_each_func_t want, void *cb_data)
 {
diff --git a/object.h b/object.h
index 0a419ba8d..df8abe96f 100644
--- a/object.h
+++ b/object.h
@@ -116,6 +116,14 @@ int object_list_contains(struct object_list *list, struct object *obj);
 void add_object_array(struct object *obj, const char *name, struct object_array *array);
 void add_object_array_with_path(struct object *obj, const char *name, struct object_array *array, unsigned mode, const char *path);
 
+/*
+ * Returns NULL if the array is empty. Otherwise, returns the last object
+ * after removing its entry from the array. Other resources associated
+ * with that object are left in an unspecified state and should not be
+ * examined.
+ */
+struct object *object_array_pop(struct object_array *array);
+
 typedef int (*object_array_each_func_t)(struct object_array_entry *, void *);
 
 /*
diff --git a/oidmap.c b/oidmap.c
new file mode 100644
index 000000000..6db4fffcd
--- /dev/null
+++ b/oidmap.c
@@ -0,0 +1,51 @@
+#include "cache.h"
+#include "oidmap.h"
+
+static int cmpfn(const void *hashmap_cmp_fn_data,
+		 const void *entry, const void *entry_or_key,
+		 const void *keydata)
+{
+	const struct oidmap_entry *entry_ = entry;
+	if (keydata)
+		return oidcmp(&entry_->oid, (const struct object_id *) keydata);
+	return oidcmp(&entry_->oid,
+		      &((const struct oidmap_entry *) entry_or_key)->oid);
+}
+
+static int hash(const struct object_id *oid)
+{
+	int hash;
+	memcpy(&hash, oid->hash, sizeof(hash));
+	return hash;
+}
+
+void oidmap_init(struct oidmap *map, size_t initial_size)
+{
+	hashmap_init(&map->map, cmpfn, NULL, initial_size);
+}
+
+void oidmap_free(struct oidmap *map, int free_entries)
+{
+	if (!map)
+		return;
+	hashmap_free(&map->map, free_entries);
+}
+
+void *oidmap_get(const struct oidmap *map, const struct object_id *key)
+{
+	return hashmap_get_from_hash(&map->map, hash(key), key);
+}
+
+void *oidmap_remove(struct oidmap *map, const struct object_id *key)
+{
+	struct hashmap_entry entry;
+	hashmap_entry_init(&entry, hash(key));
+	return hashmap_remove(&map->map, &entry, key);
+}
+
+void *oidmap_put(struct oidmap *map, void *entry)
+{
+	struct oidmap_entry *to_put = entry;
+	hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
+	return hashmap_put(&map->map, to_put);
+}
diff --git a/oidmap.h b/oidmap.h
new file mode 100644
index 000000000..18f54cde1
--- /dev/null
+++ b/oidmap.h
@@ -0,0 +1,68 @@
+#ifndef OIDMAP_H
+#define OIDMAP_H
+
+#include "hashmap.h"
+
+/*
+ * struct oidmap_entry is a structure representing an entry in the hash table,
+ * which must be used as first member of user data structures.
+ *
+ * Users should set the oid field. oidmap_put() will populate the
+ * internal_entry field.
+ */
+struct oidmap_entry {
+	/* For internal use only */
+	struct hashmap_entry internal_entry;
+
+	struct object_id oid;
+};
+
+struct oidmap {
+	struct hashmap map;
+};
+
+#define OIDMAP_INIT { { NULL } }
+
+/*
+ * Initializes an oidmap structure.
+ *
+ * `map` is the oidmap to initialize.
+ *
+ * If the total number of entries is known in advance, the `initial_size`
+ * parameter may be used to preallocate a sufficiently large table and thus
+ * prevent expensive resizing. If 0, the table is dynamically resized.
+ */
+extern void oidmap_init(struct oidmap *map, size_t initial_size);
+
+/*
+ * Frees an oidmap structure and allocated memory.
+ *
+ * If `free_entries` is true, each oidmap_entry in the map is freed as well
+ * using stdlibs free().
+ */
+extern void oidmap_free(struct oidmap *map, int free_entries);
+
+/*
+ * Returns the oidmap entry for the specified oid, or NULL if not found.
+ */
+extern void *oidmap_get(const struct oidmap *map,
+			const struct object_id *key);
+
+/*
+ * Adds or replaces an oidmap entry.
+ *
+ * ((struct oidmap_entry *) entry)->internal_entry will be populated by this
+ * function.
+ *
+ * Returns the replaced entry, or NULL if not found (i.e. the entry was added).
+ */
+extern void *oidmap_put(struct oidmap *map, void *entry);
+
+/*
+ * Removes an oidmap entry matching the specified oid.
+ *
+ * Returns the removed entry, or NULL if not found.
+ */
+extern void *oidmap_remove(struct oidmap *map, const struct object_id *key);
+
+#endif
diff --git a/oidset.c b/oidset.c
index a6a08ba52..f1f874aaa 100644
--- a/oidset.c
+++ b/oidset.c
@@ -1,50 +1,30 @@
 #include "cache.h"
 #include "oidset.h"
 
-struct oidset_entry {
-	struct hashmap_entry hash;
-	struct object_id oid;
-};
-
-static int oidset_hashcmp(const void *unused_cmp_data,
-			  const void *va, const void *vb,
-			  const void *vkey)
-{
-	const struct oidset_entry *a = va, *b = vb;
-	const struct object_id *key = vkey;
-	return oidcmp(&a->oid, key ? key : &b->oid);
-}
-
 int oidset_contains(const struct oidset *set, const struct object_id *oid)
 {
-	struct hashmap_entry key;
-
-	if (!set->map.cmpfn)
+	if (!set->map.map.tablesize)
 		return 0;
-
-	hashmap_entry_init(&key, sha1hash(oid->hash));
-	return !!hashmap_get(&set->map, &key, oid);
+	return !!oidmap_get(&set->map, oid);
 }
 
 int oidset_insert(struct oidset *set, const struct object_id *oid)
 {
-	struct oidset_entry *entry;
-
-	if (!set->map.cmpfn)
-		hashmap_init(&set->map, oidset_hashcmp, NULL, 0);
+	struct oidmap_entry *entry;
 
-	if (oidset_contains(set, oid))
+	if (!set->map.map.tablesize)
+		oidmap_init(&set->map, 0);
+	else if (oidset_contains(set, oid))
 		return 1;
 
 	entry = xmalloc(sizeof(*entry));
-	hashmap_entry_init(&entry->hash, sha1hash(oid->hash));
 	oidcpy(&entry->oid, oid);
 
-	hashmap_add(&set->map, entry);
+	oidmap_put(&set->map, entry);
 	return 0;
 }
 
 void oidset_clear(struct oidset *set)
 {
-	hashmap_free(&set->map, 1);
+	oidmap_free(&set->map, 1);
 }
diff --git a/oidset.h b/oidset.h
index b7eaab5b8..f4c9e0f9c 100644
--- a/oidset.h
+++ b/oidset.h
@@ -1,6 +1,8 @@
 #ifndef OIDSET_H
 #define OIDSET_H
 
+#include "oidmap.h"
+
 /**
  * This API is similar to sha1-array, in that it maintains a set of object ids
  * in a memory-efficient way. The major differences are:
@@ -17,10 +19,10 @@
  * A single oidset; should be zero-initialized (or use OIDSET_INIT).
  */
 struct oidset {
-	struct hashmap map;
+	struct oidmap map;
 };
 
-#define OIDSET_INIT { { NULL } }
+#define OIDSET_INIT { OIDMAP_INIT }
 
 /**
  * Returns true iff `set` contains `oid`.
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 8e47a96b3..a8df5ce2a 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -297,9 +297,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
 
 			traverse_commit_list(&revs, show_commit, show_object, base);
 
-			revs.pending.nr = 0;
-			revs.pending.alloc = 0;
-			revs.pending.objects = NULL;
+			object_array_clear(&revs.pending);
 
 			stored->bitmap = bitmap_to_ewah(base);
 			need_reset = 0;
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 327634cd7..42e3d5f4f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -9,6 +9,7 @@
 #include "pack-bitmap.h"
 #include "pack-revindex.h"
 #include "pack-objects.h"
+#include "packfile.h"
 
 /*
  * An entry on the bitmap index, representing the bitmap for a given
@@ -653,8 +654,6 @@ static int in_bitmapped_pack(struct object_list *roots)
 int prepare_bitmap_walk(struct rev_info *revs)
 {
 	unsigned int i;
-	unsigned int pending_nr = revs->pending.nr;
-	struct object_array_entry *pending_e = revs->pending.objects;
 
 	struct object_list *wants = NULL;
 	struct object_list *haves = NULL;
@@ -669,8 +668,8 @@ int prepare_bitmap_walk(struct rev_info *revs)
 			return -1;
 	}
 
-	for (i = 0; i < pending_nr; ++i) {
-		struct object *object = pending_e[i].item;
+	for (i = 0; i < revs->pending.nr; ++i) {
+		struct object *object = revs->pending.objects[i].item;
 
 		if (object->type == OBJ_NONE)
 			parse_object_or_die(&object->oid, NULL);
@@ -714,9 +713,7 @@ int prepare_bitmap_walk(struct rev_info *revs)
 	if (!bitmap_git.loaded && load_pack_bitmap() < 0)
 		return -1;
 
-	revs->pending.nr = 0;
-	revs->pending.alloc = 0;
-	revs->pending.objects = NULL;
+	object_array_clear(&revs->pending);
 
 	if (haves) {
 		revs->ignore_missing_links = 1;
diff --git a/pack-check.c b/pack-check.c
index e1fcb228f..073c1fbd4 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -2,6 +2,7 @@
 #include "pack.h"
 #include "pack-revindex.h"
 #include "progress.h"
+#include "packfile.h"
 
 struct idx_entry {
 	off_t                offset;
diff --git a/pack-write.c b/pack-write.c
index a333ec675..fea628419 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -213,14 +213,19 @@ void fixup_pack_header_footer(int pack_fd,
 	git_SHA_CTX old_sha1_ctx, new_sha1_ctx;
 	struct pack_header hdr;
 	char *buf;
+	ssize_t read_result;
 
 	git_SHA1_Init(&old_sha1_ctx);
 	git_SHA1_Init(&new_sha1_ctx);
 
 	if (lseek(pack_fd, 0, SEEK_SET) != 0)
 		die_errno("Failed seeking to start of '%s'", pack_name);
-	if (read_in_full(pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
+	read_result = read_in_full(pack_fd, &hdr, sizeof(hdr));
+	if (read_result < 0)
 		die_errno("Unable to reread header of '%s'", pack_name);
+	else if (read_result != sizeof(hdr))
+		die_errno("Unexpected short read for header of '%s'",
+			  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));
diff --git a/packfile.c b/packfile.c
new file mode 100644
index 000000000..4a5fe7ab1
--- /dev/null
+++ b/packfile.c
@@ -0,0 +1,1901 @@
+#include "cache.h"
+#include "mru.h"
+#include "pack.h"
+#include "dir.h"
+#include "mergesort.h"
+#include "packfile.h"
+#include "delta.h"
+#include "list.h"
+#include "streaming.h"
+#include "sha1-lookup.h"
+
+char *odb_pack_name(struct strbuf *buf,
+		    const unsigned char *sha1,
+		    const char *ext)
+{
+	strbuf_reset(buf);
+	strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
+		    sha1_to_hex(sha1), ext);
+	return buf->buf;
+}
+
+char *sha1_pack_name(const unsigned char *sha1)
+{
+	static struct strbuf buf = STRBUF_INIT;
+	return odb_pack_name(&buf, sha1, "pack");
+}
+
+char *sha1_pack_index_name(const unsigned char *sha1)
+{
+	static struct strbuf buf = STRBUF_INIT;
+	return odb_pack_name(&buf, sha1, "idx");
+}
+
+static unsigned int pack_used_ctr;
+static unsigned int pack_mmap_calls;
+static unsigned int peak_pack_open_windows;
+static unsigned int pack_open_windows;
+static unsigned int pack_open_fds;
+static unsigned int pack_max_fds;
+static size_t peak_pack_mapped;
+static size_t pack_mapped;
+struct packed_git *packed_git;
+struct mru packed_git_mru;
+
+#define SZ_FMT PRIuMAX
+static inline uintmax_t sz_fmt(size_t s) { return s; }
+
+void pack_report(void)
+{
+	fprintf(stderr,
+		"pack_report: getpagesize()            = %10" SZ_FMT "\n"
+		"pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
+		"pack_report: core.packedGitLimit      = %10" SZ_FMT "\n",
+		sz_fmt(getpagesize()),
+		sz_fmt(packed_git_window_size),
+		sz_fmt(packed_git_limit));
+	fprintf(stderr,
+		"pack_report: pack_used_ctr            = %10u\n"
+		"pack_report: pack_mmap_calls          = %10u\n"
+		"pack_report: pack_open_windows        = %10u / %10u\n"
+		"pack_report: pack_mapped              = "
+			"%10" SZ_FMT " / %10" SZ_FMT "\n",
+		pack_used_ctr,
+		pack_mmap_calls,
+		pack_open_windows, peak_pack_open_windows,
+		sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
+}
+
+/*
+ * Open and mmap the index file at path, perform a couple of
+ * consistency checks, then record its information to p.  Return 0 on
+ * success.
+ */
+static int check_packed_git_idx(const char *path, struct packed_git *p)
+{
+	void *idx_map;
+	struct pack_idx_header *hdr;
+	size_t idx_size;
+	uint32_t version, nr, i, *index;
+	int fd = git_open(path);
+	struct stat st;
+
+	if (fd < 0)
+		return -1;
+	if (fstat(fd, &st)) {
+		close(fd);
+		return -1;
+	}
+	idx_size = xsize_t(st.st_size);
+	if (idx_size < 4 * 256 + 20 + 20) {
+		close(fd);
+		return error("index file %s is too small", path);
+	}
+	idx_map = xmmap(NULL, idx_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	close(fd);
+
+	hdr = idx_map;
+	if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
+		version = ntohl(hdr->idx_version);
+		if (version < 2 || version > 2) {
+			munmap(idx_map, idx_size);
+			return error("index file %s is version %"PRIu32
+				     " and is not supported by this binary"
+				     " (try upgrading GIT to a newer version)",
+				     path, version);
+		}
+	} else
+		version = 1;
+
+	nr = 0;
+	index = idx_map;
+	if (version > 1)
+		index += 2;  /* skip index header */
+	for (i = 0; i < 256; i++) {
+		uint32_t n = ntohl(index[i]);
+		if (n < nr) {
+			munmap(idx_map, idx_size);
+			return error("non-monotonic index %s", path);
+		}
+		nr = n;
+	}
+
+	if (version == 1) {
+		/*
+		 * Total size:
+		 *  - 256 index entries 4 bytes each
+		 *  - 24-byte entries * nr (20-byte sha1 + 4-byte offset)
+		 *  - 20-byte SHA1 of the packfile
+		 *  - 20-byte SHA1 file checksum
+		 */
+		if (idx_size != 4*256 + nr * 24 + 20 + 20) {
+			munmap(idx_map, idx_size);
+			return error("wrong index v1 file size in %s", path);
+		}
+	} else if (version == 2) {
+		/*
+		 * Minimum size:
+		 *  - 8 bytes of header
+		 *  - 256 index entries 4 bytes each
+		 *  - 20-byte sha1 entry * nr
+		 *  - 4-byte crc entry * nr
+		 *  - 4-byte offset entry * nr
+		 *  - 20-byte SHA1 of the packfile
+		 *  - 20-byte SHA1 file checksum
+		 * And after the 4-byte offset table might be a
+		 * variable sized table containing 8-byte entries
+		 * for offsets larger than 2^31.
+		 */
+		unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20;
+		unsigned long max_size = min_size;
+		if (nr)
+			max_size += (nr - 1)*8;
+		if (idx_size < min_size || idx_size > max_size) {
+			munmap(idx_map, idx_size);
+			return error("wrong index v2 file size in %s", path);
+		}
+		if (idx_size != min_size &&
+		    /*
+		     * make sure we can deal with large pack offsets.
+		     * 31-bit signed offset won't be enough, neither
+		     * 32-bit unsigned one will be.
+		     */
+		    (sizeof(off_t) <= 4)) {
+			munmap(idx_map, idx_size);
+			return error("pack too large for current definition of off_t in %s", path);
+		}
+	}
+
+	p->index_version = version;
+	p->index_data = idx_map;
+	p->index_size = idx_size;
+	p->num_objects = nr;
+	return 0;
+}
+
+int open_pack_index(struct packed_git *p)
+{
+	char *idx_name;
+	size_t len;
+	int ret;
+
+	if (p->index_data)
+		return 0;
+
+	if (!strip_suffix(p->pack_name, ".pack", &len))
+		die("BUG: pack_name does not end in .pack");
+	idx_name = xstrfmt("%.*s.idx", (int)len, p->pack_name);
+	ret = check_packed_git_idx(idx_name, p);
+	free(idx_name);
+	return ret;
+}
+
+static struct packed_git *alloc_packed_git(int extra)
+{
+	struct packed_git *p = xmalloc(st_add(sizeof(*p), extra));
+	memset(p, 0, sizeof(*p));
+	p->pack_fd = -1;
+	return p;
+}
+
+struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)
+{
+	const char *path = sha1_pack_name(sha1);
+	size_t alloc = st_add(strlen(path), 1);
+	struct packed_git *p = alloc_packed_git(alloc);
+
+	memcpy(p->pack_name, path, alloc); /* includes NUL */
+	hashcpy(p->sha1, sha1);
+	if (check_packed_git_idx(idx_path, p)) {
+		free(p);
+		return NULL;
+	}
+
+	return p;
+}
+
+static void scan_windows(struct packed_git *p,
+	struct packed_git **lru_p,
+	struct pack_window **lru_w,
+	struct pack_window **lru_l)
+{
+	struct pack_window *w, *w_l;
+
+	for (w_l = NULL, w = p->windows; w; w = w->next) {
+		if (!w->inuse_cnt) {
+			if (!*lru_w || w->last_used < (*lru_w)->last_used) {
+				*lru_p = p;
+				*lru_w = w;
+				*lru_l = w_l;
+			}
+		}
+		w_l = w;
+	}
+}
+
+static int unuse_one_window(struct packed_git *current)
+{
+	struct packed_git *p, *lru_p = NULL;
+	struct pack_window *lru_w = NULL, *lru_l = NULL;
+
+	if (current)
+		scan_windows(current, &lru_p, &lru_w, &lru_l);
+	for (p = packed_git; p; p = p->next)
+		scan_windows(p, &lru_p, &lru_w, &lru_l);
+	if (lru_p) {
+		munmap(lru_w->base, lru_w->len);
+		pack_mapped -= lru_w->len;
+		if (lru_l)
+			lru_l->next = lru_w->next;
+		else
+			lru_p->windows = lru_w->next;
+		free(lru_w);
+		pack_open_windows--;
+		return 1;
+	}
+	return 0;
+}
+
+void release_pack_memory(size_t need)
+{
+	size_t cur = pack_mapped;
+	while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
+		; /* nothing */
+}
+
+void close_pack_windows(struct packed_git *p)
+{
+	while (p->windows) {
+		struct pack_window *w = p->windows;
+
+		if (w->inuse_cnt)
+			die("pack '%s' still has open windows to it",
+			    p->pack_name);
+		munmap(w->base, w->len);
+		pack_mapped -= w->len;
+		pack_open_windows--;
+		p->windows = w->next;
+		free(w);
+	}
+}
+
+static int close_pack_fd(struct packed_git *p)
+{
+	if (p->pack_fd < 0)
+		return 0;
+
+	close(p->pack_fd);
+	pack_open_fds--;
+	p->pack_fd = -1;
+
+	return 1;
+}
+
+void close_pack_index(struct packed_git *p)
+{
+	if (p->index_data) {
+		munmap((void *)p->index_data, p->index_size);
+		p->index_data = NULL;
+	}
+}
+
+static void close_pack(struct packed_git *p)
+{
+	close_pack_windows(p);
+	close_pack_fd(p);
+	close_pack_index(p);
+}
+
+void close_all_packs(void)
+{
+	struct packed_git *p;
+
+	for (p = packed_git; p; p = p->next)
+		if (p->do_not_close)
+			die("BUG: want to close pack marked 'do-not-close'");
+		else
+			close_pack(p);
+}
+
+/*
+ * The LRU pack is the one with the oldest MRU window, preferring packs
+ * with no used windows, or the oldest mtime if it has no windows allocated.
+ */
+static void find_lru_pack(struct packed_git *p, struct packed_git **lru_p, struct pack_window **mru_w, int *accept_windows_inuse)
+{
+	struct pack_window *w, *this_mru_w;
+	int has_windows_inuse = 0;
+
+	/*
+	 * Reject this pack if it has windows and the previously selected
+	 * one does not.  If this pack does not have windows, reject
+	 * it if the pack file is newer than the previously selected one.
+	 */
+	if (*lru_p && !*mru_w && (p->windows || p->mtime > (*lru_p)->mtime))
+		return;
+
+	for (w = this_mru_w = p->windows; w; w = w->next) {
+		/*
+		 * Reject this pack if any of its windows are in use,
+		 * but the previously selected pack did not have any
+		 * inuse windows.  Otherwise, record that this pack
+		 * has windows in use.
+		 */
+		if (w->inuse_cnt) {
+			if (*accept_windows_inuse)
+				has_windows_inuse = 1;
+			else
+				return;
+		}
+
+		if (w->last_used > this_mru_w->last_used)
+			this_mru_w = w;
+
+		/*
+		 * Reject this pack if it has windows that have been
+		 * used more recently than the previously selected pack.
+		 * If the previously selected pack had windows inuse and
+		 * we have not encountered a window in this pack that is
+		 * inuse, skip this check since we prefer a pack with no
+		 * inuse windows to one that has inuse windows.
+		 */
+		if (*mru_w && *accept_windows_inuse == has_windows_inuse &&
+		    this_mru_w->last_used > (*mru_w)->last_used)
+			return;
+	}
+
+	/*
+	 * Select this pack.
+	 */
+	*mru_w = this_mru_w;
+	*lru_p = p;
+	*accept_windows_inuse = has_windows_inuse;
+}
+
+static int close_one_pack(void)
+{
+	struct packed_git *p, *lru_p = NULL;
+	struct pack_window *mru_w = NULL;
+	int accept_windows_inuse = 1;
+
+	for (p = packed_git; p; p = p->next) {
+		if (p->pack_fd == -1)
+			continue;
+		find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse);
+	}
+
+	if (lru_p)
+		return close_pack_fd(lru_p);
+
+	return 0;
+}
+
+static unsigned int get_max_fd_limit(void)
+{
+#ifdef RLIMIT_NOFILE
+	{
+		struct rlimit lim;
+
+		if (!getrlimit(RLIMIT_NOFILE, &lim))
+			return lim.rlim_cur;
+	}
+#endif
+
+#ifdef _SC_OPEN_MAX
+	{
+		long open_max = sysconf(_SC_OPEN_MAX);
+		if (0 < open_max)
+			return open_max;
+		/*
+		 * Otherwise, we got -1 for one of the two
+		 * reasons:
+		 *
+		 * (1) sysconf() did not understand _SC_OPEN_MAX
+		 *     and signaled an error with -1; or
+		 * (2) sysconf() said there is no limit.
+		 *
+		 * We _could_ clear errno before calling sysconf() to
+		 * tell these two cases apart and return a huge number
+		 * in the latter case to let the caller cap it to a
+		 * value that is not so selfish, but letting the
+		 * fallback OPEN_MAX codepath take care of these cases
+		 * is a lot simpler.
+		 */
+	}
+#endif
+
+#ifdef OPEN_MAX
+	return OPEN_MAX;
+#else
+	return 1; /* see the caller ;-) */
+#endif
+}
+
+/*
+ * Do not call this directly as this leaks p->pack_fd on error return;
+ * call open_packed_git() instead.
+ */
+static int open_packed_git_1(struct packed_git *p)
+{
+	struct stat st;
+	struct pack_header hdr;
+	unsigned char sha1[20];
+	unsigned char *idx_sha1;
+	long fd_flag;
+	ssize_t read_result;
+
+	if (!p->index_data && open_pack_index(p))
+		return error("packfile %s index unavailable", p->pack_name);
+
+	if (!pack_max_fds) {
+		unsigned int max_fds = get_max_fd_limit();
+
+		/* Save 3 for stdin/stdout/stderr, 22 for work */
+		if (25 < max_fds)
+			pack_max_fds = max_fds - 25;
+		else
+			pack_max_fds = 1;
+	}
+
+	while (pack_max_fds <= pack_open_fds && close_one_pack())
+		; /* nothing */
+
+	p->pack_fd = git_open(p->pack_name);
+	if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
+		return -1;
+	pack_open_fds++;
+
+	/* If we created the struct before we had the pack we lack size. */
+	if (!p->pack_size) {
+		if (!S_ISREG(st.st_mode))
+			return error("packfile %s not a regular file", p->pack_name);
+		p->pack_size = st.st_size;
+	} else if (p->pack_size != st.st_size)
+		return error("packfile %s size changed", p->pack_name);
+
+	/* We leave these file descriptors open with sliding mmap;
+	 * there is no point keeping them open across exec(), though.
+	 */
+	fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
+	if (fd_flag < 0)
+		return error("cannot determine file descriptor flags");
+	fd_flag |= FD_CLOEXEC;
+	if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
+		return error("cannot set FD_CLOEXEC");
+
+	/* Verify we recognize this pack file format. */
+	read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr));
+	if (read_result < 0)
+		return error_errno("error reading from %s", p->pack_name);
+	if (read_result != sizeof(hdr))
+		return error("file %s is far too short to be a packfile", p->pack_name);
+	if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
+		return error("file %s is not a GIT packfile", p->pack_name);
+	if (!pack_version_ok(hdr.hdr_version))
+		return error("packfile %s is version %"PRIu32" and not"
+			" supported (try upgrading GIT to a newer version)",
+			p->pack_name, ntohl(hdr.hdr_version));
+
+	/* Verify the pack matches its index. */
+	if (p->num_objects != ntohl(hdr.hdr_entries))
+		return error("packfile %s claims to have %"PRIu32" objects"
+			     " while index indicates %"PRIu32" objects",
+			     p->pack_name, ntohl(hdr.hdr_entries),
+			     p->num_objects);
+	if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
+		return error("end of packfile %s is unavailable", p->pack_name);
+	read_result = read_in_full(p->pack_fd, sha1, sizeof(sha1));
+	if (read_result < 0)
+		return error_errno("error reading from %s", p->pack_name);
+	if (read_result != sizeof(sha1))
+		return error("packfile %s signature is unavailable", p->pack_name);
+	idx_sha1 = ((unsigned char *)p->index_data) + p->index_size - 40;
+	if (hashcmp(sha1, idx_sha1))
+		return error("packfile %s does not match index", p->pack_name);
+	return 0;
+}
+
+static int open_packed_git(struct packed_git *p)
+{
+	if (!open_packed_git_1(p))
+		return 0;
+	close_pack_fd(p);
+	return -1;
+}
+
+static int in_window(struct pack_window *win, off_t offset)
+{
+	/* We must promise at least 20 bytes (one hash) after the
+	 * offset is available from this window, otherwise the offset
+	 * is not actually in this window and a different window (which
+	 * has that one hash excess) must be used.  This is to support
+	 * the object header and delta base parsing routines below.
+	 */
+	off_t win_off = win->offset;
+	return win_off <= offset
+		&& (offset + 20) <= (win_off + win->len);
+}
+
+unsigned char *use_pack(struct packed_git *p,
+		struct pack_window **w_cursor,
+		off_t offset,
+		unsigned long *left)
+{
+	struct pack_window *win = *w_cursor;
+
+	/* Since packfiles end in a hash of their content and it's
+	 * pointless to ask for an offset into the middle of that
+	 * hash, and the in_window function above wouldn't match
+	 * don't allow an offset too close to the end of the file.
+	 */
+	if (!p->pack_size && p->pack_fd == -1 && open_packed_git(p))
+		die("packfile %s cannot be accessed", p->pack_name);
+	if (offset > (p->pack_size - 20))
+		die("offset beyond end of packfile (truncated pack?)");
+	if (offset < 0)
+		die(_("offset before end of packfile (broken .idx?)"));
+
+	if (!win || !in_window(win, offset)) {
+		if (win)
+			win->inuse_cnt--;
+		for (win = p->windows; win; win = win->next) {
+			if (in_window(win, offset))
+				break;
+		}
+		if (!win) {
+			size_t window_align = packed_git_window_size / 2;
+			off_t len;
+
+			if (p->pack_fd == -1 && open_packed_git(p))
+				die("packfile %s cannot be accessed", p->pack_name);
+
+			win = xcalloc(1, sizeof(*win));
+			win->offset = (offset / window_align) * window_align;
+			len = p->pack_size - win->offset;
+			if (len > packed_git_window_size)
+				len = packed_git_window_size;
+			win->len = (size_t)len;
+			pack_mapped += win->len;
+			while (packed_git_limit < pack_mapped
+				&& unuse_one_window(p))
+				; /* nothing */
+			win->base = xmmap(NULL, win->len,
+				PROT_READ, MAP_PRIVATE,
+				p->pack_fd, win->offset);
+			if (win->base == MAP_FAILED)
+				die_errno("packfile %s cannot be mapped",
+					  p->pack_name);
+			if (!win->offset && win->len == p->pack_size
+				&& !p->do_not_close)
+				close_pack_fd(p);
+			pack_mmap_calls++;
+			pack_open_windows++;
+			if (pack_mapped > peak_pack_mapped)
+				peak_pack_mapped = pack_mapped;
+			if (pack_open_windows > peak_pack_open_windows)
+				peak_pack_open_windows = pack_open_windows;
+			win->next = p->windows;
+			p->windows = win;
+		}
+	}
+	if (win != *w_cursor) {
+		win->last_used = pack_used_ctr++;
+		win->inuse_cnt++;
+		*w_cursor = win;
+	}
+	offset -= win->offset;
+	if (left)
+		*left = win->len - xsize_t(offset);
+	return win->base + offset;
+}
+
+void unuse_pack(struct pack_window **w_cursor)
+{
+	struct pack_window *w = *w_cursor;
+	if (w) {
+		w->inuse_cnt--;
+		*w_cursor = NULL;
+	}
+}
+
+static void try_to_free_pack_memory(size_t size)
+{
+	release_pack_memory(size);
+}
+
+struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
+{
+	static int have_set_try_to_free_routine;
+	struct stat st;
+	size_t alloc;
+	struct packed_git *p;
+
+	if (!have_set_try_to_free_routine) {
+		have_set_try_to_free_routine = 1;
+		set_try_to_free_routine(try_to_free_pack_memory);
+	}
+
+	/*
+	 * Make sure a corresponding .pack file exists and that
+	 * the index looks sane.
+	 */
+	if (!strip_suffix_mem(path, &path_len, ".idx"))
+		return NULL;
+
+	/*
+	 * ".pack" is long enough to hold any suffix we're adding (and
+	 * the use xsnprintf double-checks that)
+	 */
+	alloc = st_add3(path_len, strlen(".pack"), 1);
+	p = alloc_packed_git(alloc);
+	memcpy(p->pack_name, path, path_len);
+
+	xsnprintf(p->pack_name + path_len, alloc - path_len, ".keep");
+	if (!access(p->pack_name, F_OK))
+		p->pack_keep = 1;
+
+	xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
+	if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
+		free(p);
+		return NULL;
+	}
+
+	/* ok, it looks sane as far as we can check without
+	 * actually mapping the pack file.
+	 */
+	p->pack_size = st.st_size;
+	p->pack_local = local;
+	p->mtime = st.st_mtime;
+	if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1))
+		hashclr(p->sha1);
+	return p;
+}
+
+void install_packed_git(struct packed_git *pack)
+{
+	if (pack->pack_fd != -1)
+		pack_open_fds++;
+
+	pack->next = packed_git;
+	packed_git = pack;
+}
+
+void (*report_garbage)(unsigned seen_bits, const char *path);
+
+static void report_helper(const struct string_list *list,
+			  int seen_bits, int first, int last)
+{
+	if (seen_bits == (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX))
+		return;
+
+	for (; first < last; first++)
+		report_garbage(seen_bits, list->items[first].string);
+}
+
+static void report_pack_garbage(struct string_list *list)
+{
+	int i, baselen = -1, first = 0, seen_bits = 0;
+
+	if (!report_garbage)
+		return;
+
+	string_list_sort(list);
+
+	for (i = 0; i < list->nr; i++) {
+		const char *path = list->items[i].string;
+		if (baselen != -1 &&
+		    strncmp(path, list->items[first].string, baselen)) {
+			report_helper(list, seen_bits, first, i);
+			baselen = -1;
+			seen_bits = 0;
+		}
+		if (baselen == -1) {
+			const char *dot = strrchr(path, '.');
+			if (!dot) {
+				report_garbage(PACKDIR_FILE_GARBAGE, path);
+				continue;
+			}
+			baselen = dot - path + 1;
+			first = i;
+		}
+		if (!strcmp(path + baselen, "pack"))
+			seen_bits |= 1;
+		else if (!strcmp(path + baselen, "idx"))
+			seen_bits |= 2;
+	}
+	report_helper(list, seen_bits, first, list->nr);
+}
+
+static void prepare_packed_git_one(char *objdir, int local)
+{
+	struct strbuf path = STRBUF_INIT;
+	size_t dirnamelen;
+	DIR *dir;
+	struct dirent *de;
+	struct string_list garbage = STRING_LIST_INIT_DUP;
+
+	strbuf_addstr(&path, objdir);
+	strbuf_addstr(&path, "/pack");
+	dir = opendir(path.buf);
+	if (!dir) {
+		if (errno != ENOENT)
+			error_errno("unable to open object pack directory: %s",
+				    path.buf);
+		strbuf_release(&path);
+		return;
+	}
+	strbuf_addch(&path, '/');
+	dirnamelen = path.len;
+	while ((de = readdir(dir)) != NULL) {
+		struct packed_git *p;
+		size_t base_len;
+
+		if (is_dot_or_dotdot(de->d_name))
+			continue;
+
+		strbuf_setlen(&path, dirnamelen);
+		strbuf_addstr(&path, de->d_name);
+
+		base_len = path.len;
+		if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
+			/* Don't reopen a pack we already have. */
+			for (p = packed_git; p; p = p->next) {
+				size_t len;
+				if (strip_suffix(p->pack_name, ".pack", &len) &&
+				    len == base_len &&
+				    !memcmp(p->pack_name, path.buf, len))
+					break;
+			}
+			if (p == NULL &&
+			    /*
+			     * See if it really is a valid .idx file with
+			     * corresponding .pack file that we can map.
+			     */
+			    (p = add_packed_git(path.buf, path.len, local)) != NULL)
+				install_packed_git(p);
+		}
+
+		if (!report_garbage)
+			continue;
+
+		if (ends_with(de->d_name, ".idx") ||
+		    ends_with(de->d_name, ".pack") ||
+		    ends_with(de->d_name, ".bitmap") ||
+		    ends_with(de->d_name, ".keep"))
+			string_list_append(&garbage, path.buf);
+		else
+			report_garbage(PACKDIR_FILE_GARBAGE, path.buf);
+	}
+	closedir(dir);
+	report_pack_garbage(&garbage);
+	string_list_clear(&garbage, 0);
+	strbuf_release(&path);
+}
+
+static int approximate_object_count_valid;
+
+/*
+ * Give a fast, rough count of the number of objects in the repository. This
+ * ignores loose objects completely. If you have a lot of them, then either
+ * you should repack because your performance will be awful, or they are
+ * all unreachable objects about to be pruned, in which case they're not really
+ * interesting as a measure of repo size in the first place.
+ */
+unsigned long approximate_object_count(void)
+{
+	static unsigned long count;
+	if (!approximate_object_count_valid) {
+		struct packed_git *p;
+
+		prepare_packed_git();
+		count = 0;
+		for (p = packed_git; p; p = p->next) {
+			if (open_pack_index(p))
+				continue;
+			count += p->num_objects;
+		}
+	}
+	return count;
+}
+
+static void *get_next_packed_git(const void *p)
+{
+	return ((const struct packed_git *)p)->next;
+}
+
+static void set_next_packed_git(void *p, void *next)
+{
+	((struct packed_git *)p)->next = next;
+}
+
+static int sort_pack(const void *a_, const void *b_)
+{
+	const struct packed_git *a = a_;
+	const struct packed_git *b = b_;
+	int st;
+
+	/*
+	 * Local packs tend to contain objects specific to our
+	 * variant of the project than remote ones.  In addition,
+	 * remote ones could be on a network mounted filesystem.
+	 * Favor local ones for these reasons.
+	 */
+	st = a->pack_local - b->pack_local;
+	if (st)
+		return -st;
+
+	/*
+	 * Younger packs tend to contain more recent objects,
+	 * and more recent objects tend to get accessed more
+	 * often.
+	 */
+	if (a->mtime < b->mtime)
+		return 1;
+	else if (a->mtime == b->mtime)
+		return 0;
+	return -1;
+}
+
+static void rearrange_packed_git(void)
+{
+	packed_git = llist_mergesort(packed_git, get_next_packed_git,
+				     set_next_packed_git, sort_pack);
+}
+
+static void prepare_packed_git_mru(void)
+{
+	struct packed_git *p;
+
+	mru_clear(&packed_git_mru);
+	for (p = packed_git; p; p = p->next)
+		mru_append(&packed_git_mru, p);
+}
+
+static int prepare_packed_git_run_once = 0;
+void prepare_packed_git(void)
+{
+	struct alternate_object_database *alt;
+
+	if (prepare_packed_git_run_once)
+		return;
+	prepare_packed_git_one(get_object_directory(), 1);
+	prepare_alt_odb();
+	for (alt = alt_odb_list; alt; alt = alt->next)
+		prepare_packed_git_one(alt->path, 0);
+	rearrange_packed_git();
+	prepare_packed_git_mru();
+	prepare_packed_git_run_once = 1;
+}
+
+void reprepare_packed_git(void)
+{
+	approximate_object_count_valid = 0;
+	prepare_packed_git_run_once = 0;
+	prepare_packed_git();
+}
+
+unsigned long unpack_object_header_buffer(const unsigned char *buf,
+		unsigned long len, enum object_type *type, unsigned long *sizep)
+{
+	unsigned shift;
+	unsigned long size, c;
+	unsigned long used = 0;
+
+	c = buf[used++];
+	*type = (c >> 4) & 7;
+	size = c & 15;
+	shift = 4;
+	while (c & 0x80) {
+		if (len <= used || bitsizeof(long) <= shift) {
+			error("bad object header");
+			size = used = 0;
+			break;
+		}
+		c = buf[used++];
+		size += (c & 0x7f) << shift;
+		shift += 7;
+	}
+	*sizep = size;
+	return used;
+}
+
+unsigned long get_size_from_delta(struct packed_git *p,
+				  struct pack_window **w_curs,
+				  off_t curpos)
+{
+	const unsigned char *data;
+	unsigned char delta_head[20], *in;
+	git_zstream stream;
+	int st;
+
+	memset(&stream, 0, sizeof(stream));
+	stream.next_out = delta_head;
+	stream.avail_out = sizeof(delta_head);
+
+	git_inflate_init(&stream);
+	do {
+		in = use_pack(p, w_curs, curpos, &stream.avail_in);
+		stream.next_in = in;
+		st = git_inflate(&stream, Z_FINISH);
+		curpos += stream.next_in - in;
+	} while ((st == Z_OK || st == Z_BUF_ERROR) &&
+		 stream.total_out < sizeof(delta_head));
+	git_inflate_end(&stream);
+	if ((st != Z_STREAM_END) && stream.total_out != sizeof(delta_head)) {
+		error("delta data unpack-initial failed");
+		return 0;
+	}
+
+	/* Examine the initial part of the delta to figure out
+	 * the result size.
+	 */
+	data = delta_head;
+
+	/* ignore base size */
+	get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
+
+	/* Read the result size */
+	return get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
+}
+
+int unpack_object_header(struct packed_git *p,
+			 struct pack_window **w_curs,
+			 off_t *curpos,
+			 unsigned long *sizep)
+{
+	unsigned char *base;
+	unsigned long left;
+	unsigned long used;
+	enum object_type type;
+
+	/* use_pack() assures us we have [base, base + 20) available
+	 * as a range that we can look at.  (Its actually the hash
+	 * size that is assured.)  With our object header encoding
+	 * the maximum deflated object size is 2^137, which is just
+	 * insane, so we know won't exceed what we have been given.
+	 */
+	base = use_pack(p, w_curs, *curpos, &left);
+	used = unpack_object_header_buffer(base, left, &type, sizep);
+	if (!used) {
+		type = OBJ_BAD;
+	} else
+		*curpos += used;
+
+	return type;
+}
+
+void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
+{
+	unsigned i;
+	for (i = 0; i < p->num_bad_objects; i++)
+		if (!hashcmp(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
+			return;
+	p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
+				      st_mult(GIT_MAX_RAWSZ,
+					      st_add(p->num_bad_objects, 1)));
+	hashcpy(p->bad_object_sha1 + GIT_SHA1_RAWSZ * p->num_bad_objects, sha1);
+	p->num_bad_objects++;
+}
+
+const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
+{
+	struct packed_git *p;
+	unsigned i;
+
+	for (p = packed_git; p; p = p->next)
+		for (i = 0; i < p->num_bad_objects; i++)
+			if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
+				return p;
+	return NULL;
+}
+
+static off_t get_delta_base(struct packed_git *p,
+				    struct pack_window **w_curs,
+				    off_t *curpos,
+				    enum object_type type,
+				    off_t delta_obj_offset)
+{
+	unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
+	off_t base_offset;
+
+	/* use_pack() assured us we have [base_info, base_info + 20)
+	 * as a range that we can look at without walking off the
+	 * end of the mapped window.  Its actually the hash size
+	 * that is assured.  An OFS_DELTA longer than the hash size
+	 * is stupid, as then a REF_DELTA would be smaller to store.
+	 */
+	if (type == OBJ_OFS_DELTA) {
+		unsigned used = 0;
+		unsigned char c = base_info[used++];
+		base_offset = c & 127;
+		while (c & 128) {
+			base_offset += 1;
+			if (!base_offset || MSB(base_offset, 7))
+				return 0;  /* overflow */
+			c = base_info[used++];
+			base_offset = (base_offset << 7) + (c & 127);
+		}
+		base_offset = delta_obj_offset - base_offset;
+		if (base_offset <= 0 || base_offset >= delta_obj_offset)
+			return 0;  /* out of bound */
+		*curpos += used;
+	} else if (type == OBJ_REF_DELTA) {
+		/* The base entry _must_ be in the same pack */
+		base_offset = find_pack_entry_one(base_info, p);
+		*curpos += 20;
+	} else
+		die("I am totally screwed");
+	return base_offset;
+}
+
+/*
+ * Like get_delta_base above, but we return the sha1 instead of the pack
+ * offset. This means it is cheaper for REF deltas (we do not have to do
+ * the final object lookup), but more expensive for OFS deltas (we
+ * have to load the revidx to convert the offset back into a sha1).
+ */
+static const unsigned char *get_delta_base_sha1(struct packed_git *p,
+						struct pack_window **w_curs,
+						off_t curpos,
+						enum object_type type,
+						off_t delta_obj_offset)
+{
+	if (type == OBJ_REF_DELTA) {
+		unsigned char *base = use_pack(p, w_curs, curpos, NULL);
+		return base;
+	} else if (type == OBJ_OFS_DELTA) {
+		struct revindex_entry *revidx;
+		off_t base_offset = get_delta_base(p, w_curs, &curpos,
+						   type, delta_obj_offset);
+
+		if (!base_offset)
+			return NULL;
+
+		revidx = find_pack_revindex(p, base_offset);
+		if (!revidx)
+			return NULL;
+
+		return nth_packed_object_sha1(p, revidx->nr);
+	} else
+		return NULL;
+}
+
+static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
+{
+	int type;
+	struct revindex_entry *revidx;
+	const unsigned char *sha1;
+	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);
+	if (type <= OBJ_NONE)
+		return OBJ_BAD;
+	return type;
+}
+
+#define POI_STACK_PREALLOC 64
+
+static enum object_type packed_to_object_type(struct packed_git *p,
+					      off_t obj_offset,
+					      enum object_type type,
+					      struct pack_window **w_curs,
+					      off_t curpos)
+{
+	off_t small_poi_stack[POI_STACK_PREALLOC];
+	off_t *poi_stack = small_poi_stack;
+	int poi_stack_nr = 0, poi_stack_alloc = POI_STACK_PREALLOC;
+
+	while (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+		off_t base_offset;
+		unsigned long size;
+		/* Push the object we're going to leave behind */
+		if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
+			poi_stack_alloc = alloc_nr(poi_stack_nr);
+			ALLOC_ARRAY(poi_stack, poi_stack_alloc);
+			memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr);
+		} else {
+			ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc);
+		}
+		poi_stack[poi_stack_nr++] = obj_offset;
+		/* If parsing the base offset fails, just unwind */
+		base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
+		if (!base_offset)
+			goto unwind;
+		curpos = obj_offset = base_offset;
+		type = unpack_object_header(p, w_curs, &curpos, &size);
+		if (type <= OBJ_NONE) {
+			/* If getting the base itself fails, we first
+			 * retry the base, otherwise unwind */
+			type = retry_bad_packed_offset(p, base_offset);
+			if (type > OBJ_NONE)
+				goto out;
+			goto unwind;
+		}
+	}
+
+	switch (type) {
+	case OBJ_BAD:
+	case OBJ_COMMIT:
+	case OBJ_TREE:
+	case OBJ_BLOB:
+	case OBJ_TAG:
+		break;
+	default:
+		error("unknown object type %i at offset %"PRIuMAX" in %s",
+		      type, (uintmax_t)obj_offset, p->pack_name);
+		type = OBJ_BAD;
+	}
+
+out:
+	if (poi_stack != small_poi_stack)
+		free(poi_stack);
+	return type;
+
+unwind:
+	while (poi_stack_nr) {
+		obj_offset = poi_stack[--poi_stack_nr];
+		type = retry_bad_packed_offset(p, obj_offset);
+		if (type > OBJ_NONE)
+			goto out;
+	}
+	type = OBJ_BAD;
+	goto out;
+}
+
+static struct hashmap delta_base_cache;
+static size_t delta_base_cached;
+
+static LIST_HEAD(delta_base_cache_lru);
+
+struct delta_base_cache_key {
+	struct packed_git *p;
+	off_t base_offset;
+};
+
+struct delta_base_cache_entry {
+	struct hashmap hash;
+	struct delta_base_cache_key key;
+	struct list_head lru;
+	void *data;
+	unsigned long size;
+	enum object_type type;
+};
+
+static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset)
+{
+	unsigned int hash;
+
+	hash = (unsigned int)(intptr_t)p + (unsigned int)base_offset;
+	hash += (hash >> 8) + (hash >> 16);
+	return hash;
+}
+
+static struct delta_base_cache_entry *
+get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
+{
+	struct hashmap_entry entry;
+	struct delta_base_cache_key key;
+
+	if (!delta_base_cache.cmpfn)
+		return NULL;
+
+	hashmap_entry_init(&entry, pack_entry_hash(p, base_offset));
+	key.p = p;
+	key.base_offset = base_offset;
+	return hashmap_get(&delta_base_cache, &entry, &key);
+}
+
+static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
+				   const struct delta_base_cache_key *b)
+{
+	return a->p == b->p && a->base_offset == b->base_offset;
+}
+
+static int delta_base_cache_hash_cmp(const void *unused_cmp_data,
+				     const void *va, const void *vb,
+				     const void *vkey)
+{
+	const struct delta_base_cache_entry *a = va, *b = vb;
+	const struct delta_base_cache_key *key = vkey;
+	if (key)
+		return !delta_base_cache_key_eq(&a->key, key);
+	else
+		return !delta_base_cache_key_eq(&a->key, &b->key);
+}
+
+static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
+{
+	return !!get_delta_base_cache_entry(p, base_offset);
+}
+
+/*
+ * Remove the entry from the cache, but do _not_ free the associated
+ * entry data. The caller takes ownership of the "data" buffer, and
+ * should copy out any fields it wants before detaching.
+ */
+static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)
+{
+	hashmap_remove(&delta_base_cache, ent, &ent->key);
+	list_del(&ent->lru);
+	delta_base_cached -= ent->size;
+	free(ent);
+}
+
+static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
+	unsigned long *base_size, enum object_type *type)
+{
+	struct delta_base_cache_entry *ent;
+
+	ent = get_delta_base_cache_entry(p, base_offset);
+	if (!ent)
+		return unpack_entry(p, base_offset, type, base_size);
+
+	if (type)
+		*type = ent->type;
+	if (base_size)
+		*base_size = ent->size;
+	return xmemdupz(ent->data, ent->size);
+}
+
+static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
+{
+	free(ent->data);
+	detach_delta_base_cache_entry(ent);
+}
+
+void clear_delta_base_cache(void)
+{
+	struct list_head *lru, *tmp;
+	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
+		struct delta_base_cache_entry *entry =
+			list_entry(lru, struct delta_base_cache_entry, lru);
+		release_delta_base_cache(entry);
+	}
+}
+
+static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
+	void *base, unsigned long base_size, enum object_type type)
+{
+	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
+	struct list_head *lru, *tmp;
+
+	delta_base_cached += base_size;
+
+	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
+		struct delta_base_cache_entry *f =
+			list_entry(lru, struct delta_base_cache_entry, lru);
+		if (delta_base_cached <= delta_base_cache_limit)
+			break;
+		release_delta_base_cache(f);
+	}
+
+	ent->key.p = p;
+	ent->key.base_offset = base_offset;
+	ent->type = type;
+	ent->data = base;
+	ent->size = base_size;
+	list_add_tail(&ent->lru, &delta_base_cache_lru);
+
+	if (!delta_base_cache.cmpfn)
+		hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0);
+	hashmap_entry_init(ent, pack_entry_hash(p, base_offset));
+	hashmap_add(&delta_base_cache, ent);
+}
+
+int packed_object_info(struct packed_git *p, off_t obj_offset,
+		       struct object_info *oi)
+{
+	struct pack_window *w_curs = NULL;
+	unsigned long size;
+	off_t curpos = obj_offset;
+	enum object_type type;
+
+	/*
+	 * We always get the representation type, but only convert it to
+	 * a "real" type later if the caller is interested.
+	 */
+	if (oi->contentp) {
+		*oi->contentp = cache_or_unpack_entry(p, obj_offset, oi->sizep,
+						      &type);
+		if (!*oi->contentp)
+			type = OBJ_BAD;
+	} else {
+		type = unpack_object_header(p, &w_curs, &curpos, &size);
+	}
+
+	if (!oi->contentp && oi->sizep) {
+		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+			off_t tmp_pos = curpos;
+			off_t base_offset = get_delta_base(p, &w_curs, &tmp_pos,
+							   type, obj_offset);
+			if (!base_offset) {
+				type = OBJ_BAD;
+				goto out;
+			}
+			*oi->sizep = get_size_from_delta(p, &w_curs, tmp_pos);
+			if (*oi->sizep == 0) {
+				type = OBJ_BAD;
+				goto out;
+			}
+		} else {
+			*oi->sizep = size;
+		}
+	}
+
+	if (oi->disk_sizep) {
+		struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
+		*oi->disk_sizep = revidx[1].offset - obj_offset;
+	}
+
+	if (oi->typep || oi->typename) {
+		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 (tn)
+				strbuf_addstr(oi->typename, tn);
+		}
+		if (ptot < 0) {
+			type = OBJ_BAD;
+			goto out;
+		}
+	}
+
+	if (oi->delta_base_sha1) {
+		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+			const unsigned char *base;
+
+			base = get_delta_base_sha1(p, &w_curs, curpos,
+						   type, obj_offset);
+			if (!base) {
+				type = OBJ_BAD;
+				goto out;
+			}
+
+			hashcpy(oi->delta_base_sha1, base);
+		} else
+			hashclr(oi->delta_base_sha1);
+	}
+
+	oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
+							  OI_PACKED;
+
+out:
+	unuse_pack(&w_curs);
+	return type;
+}
+
+static void *unpack_compressed_entry(struct packed_git *p,
+				    struct pack_window **w_curs,
+				    off_t curpos,
+				    unsigned long size)
+{
+	int st;
+	git_zstream stream;
+	unsigned char *buffer, *in;
+
+	buffer = xmallocz_gently(size);
+	if (!buffer)
+		return NULL;
+	memset(&stream, 0, sizeof(stream));
+	stream.next_out = buffer;
+	stream.avail_out = size + 1;
+
+	git_inflate_init(&stream);
+	do {
+		in = use_pack(p, w_curs, curpos, &stream.avail_in);
+		stream.next_in = in;
+		st = git_inflate(&stream, Z_FINISH);
+		if (!stream.avail_out)
+			break; /* the payload is larger than it should be */
+		curpos += stream.next_in - in;
+	} while (st == Z_OK || st == Z_BUF_ERROR);
+	git_inflate_end(&stream);
+	if ((st != Z_STREAM_END) || stream.total_out != size) {
+		free(buffer);
+		return NULL;
+	}
+
+	return buffer;
+}
+
+static void write_pack_access_log(struct packed_git *p, off_t obj_offset)
+{
+	static struct trace_key pack_access = TRACE_KEY_INIT(PACK_ACCESS);
+	trace_printf_key(&pack_access, "%s %"PRIuMAX"\n",
+			 p->pack_name, (uintmax_t)obj_offset);
+}
+
+int do_check_packed_object_crc;
+
+#define UNPACK_ENTRY_STACK_PREALLOC 64
+struct unpack_entry_stack_ent {
+	off_t obj_offset;
+	off_t curpos;
+	unsigned long size;
+};
+
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+			 unsigned long *size)
+{
+	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)
+		return NULL;
+	return content;
+}
+
+void *unpack_entry(struct packed_git *p, off_t obj_offset,
+		   enum object_type *final_type, unsigned long *final_size)
+{
+	struct pack_window *w_curs = NULL;
+	off_t curpos = obj_offset;
+	void *data = NULL;
+	unsigned long size;
+	enum object_type type;
+	struct unpack_entry_stack_ent small_delta_stack[UNPACK_ENTRY_STACK_PREALLOC];
+	struct unpack_entry_stack_ent *delta_stack = small_delta_stack;
+	int delta_stack_nr = 0, delta_stack_alloc = UNPACK_ENTRY_STACK_PREALLOC;
+	int base_from_cache = 0;
+
+	write_pack_access_log(p, obj_offset);
+
+	/* PHASE 1: drill down to the innermost base object */
+	for (;;) {
+		off_t base_offset;
+		int i;
+		struct delta_base_cache_entry *ent;
+
+		ent = get_delta_base_cache_entry(p, curpos);
+		if (ent) {
+			type = ent->type;
+			data = ent->data;
+			size = ent->size;
+			detach_delta_base_cache_entry(ent);
+			base_from_cache = 1;
+			break;
+		}
+
+		if (do_check_packed_object_crc && p->index_version > 1) {
+			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);
+				error("bad packed object CRC for %s",
+				      sha1_to_hex(sha1));
+				mark_bad_packed_object(p, sha1);
+				data = NULL;
+				goto out;
+			}
+		}
+
+		type = unpack_object_header(p, &w_curs, &curpos, &size);
+		if (type != OBJ_OFS_DELTA && type != OBJ_REF_DELTA)
+			break;
+
+		base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
+		if (!base_offset) {
+			error("failed to validate delta base reference "
+			      "at offset %"PRIuMAX" from %s",
+			      (uintmax_t)curpos, p->pack_name);
+			/* bail to phase 2, in hopes of recovery */
+			data = NULL;
+			break;
+		}
+
+		/* push object, proceed to base */
+		if (delta_stack_nr >= delta_stack_alloc
+		    && delta_stack == small_delta_stack) {
+			delta_stack_alloc = alloc_nr(delta_stack_nr);
+			ALLOC_ARRAY(delta_stack, delta_stack_alloc);
+			memcpy(delta_stack, small_delta_stack,
+			       sizeof(*delta_stack)*delta_stack_nr);
+		} else {
+			ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
+		}
+		i = delta_stack_nr++;
+		delta_stack[i].obj_offset = obj_offset;
+		delta_stack[i].curpos = curpos;
+		delta_stack[i].size = size;
+
+		curpos = obj_offset = base_offset;
+	}
+
+	/* PHASE 2: handle the base */
+	switch (type) {
+	case OBJ_OFS_DELTA:
+	case OBJ_REF_DELTA:
+		if (data)
+			die("BUG: unpack_entry: left loop at a valid delta");
+		break;
+	case OBJ_COMMIT:
+	case OBJ_TREE:
+	case OBJ_BLOB:
+	case OBJ_TAG:
+		if (!base_from_cache)
+			data = unpack_compressed_entry(p, &w_curs, curpos, size);
+		break;
+	default:
+		data = NULL;
+		error("unknown object type %i at offset %"PRIuMAX" in %s",
+		      type, (uintmax_t)obj_offset, p->pack_name);
+	}
+
+	/* PHASE 3: apply deltas in order */
+
+	/* invariants:
+	 *   'data' holds the base data, or NULL if there was corruption
+	 */
+	while (delta_stack_nr) {
+		void *delta_data;
+		void *base = data;
+		void *external_base = NULL;
+		unsigned long delta_size, base_size = size;
+		int i;
+
+		data = NULL;
+
+		if (base)
+			add_delta_base_cache(p, obj_offset, base, base_size, type);
+
+		if (!base) {
+			/*
+			 * We're probably in deep shit, but let's try to fetch
+			 * the required base anyway from another pack or loose.
+			 * This is costly but should happen only in the presence
+			 * of a corrupted pack, and is better than failing outright.
+			 */
+			struct revindex_entry *revidx;
+			const unsigned char *base_sha1;
+			revidx = find_pack_revindex(p, obj_offset);
+			if (revidx) {
+				base_sha1 = nth_packed_object_sha1(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,
+				      p->pack_name);
+				mark_bad_packed_object(p, base_sha1);
+				base = read_object(base_sha1, &type, &base_size);
+				external_base = base;
+			}
+		}
+
+		i = --delta_stack_nr;
+		obj_offset = delta_stack[i].obj_offset;
+		curpos = delta_stack[i].curpos;
+		delta_size = delta_stack[i].size;
+
+		if (!base)
+			continue;
+
+		delta_data = unpack_compressed_entry(p, &w_curs, curpos, delta_size);
+
+		if (!delta_data) {
+			error("failed to unpack compressed delta "
+			      "at offset %"PRIuMAX" from %s",
+			      (uintmax_t)curpos, p->pack_name);
+			data = NULL;
+			free(external_base);
+			continue;
+		}
+
+		data = patch_delta(base, base_size,
+				   delta_data, delta_size,
+				   &size);
+
+		/*
+		 * We could not apply the delta; warn the user, but keep going.
+		 * Our failure will be noticed either in the next iteration of
+		 * the loop, or if this is the final delta, in the caller when
+		 * we return NULL. Those code paths will take care of making
+		 * a more explicit warning and retrying with another copy of
+		 * the object.
+		 */
+		if (!data)
+			error("failed to apply delta");
+
+		free(delta_data);
+		free(external_base);
+	}
+
+	if (final_type)
+		*final_type = type;
+	if (final_size)
+		*final_size = size;
+
+out:
+	unuse_pack(&w_curs);
+
+	if (delta_stack != small_delta_stack)
+		free(delta_stack);
+
+	return data;
+}
+
+const unsigned char *nth_packed_object_sha1(struct packed_git *p,
+					    uint32_t n)
+{
+	const unsigned char *index = p->index_data;
+	if (!index) {
+		if (open_pack_index(p))
+			return NULL;
+		index = p->index_data;
+	}
+	if (n >= p->num_objects)
+		return NULL;
+	index += 4 * 256;
+	if (p->index_version == 1) {
+		return index + 24 * n + 4;
+	} else {
+		index += 8;
+		return index + 20 * n;
+	}
+}
+
+const struct object_id *nth_packed_object_oid(struct object_id *oid,
+					      struct packed_git *p,
+					      uint32_t n)
+{
+	const unsigned char *hash = nth_packed_object_sha1(p, n);
+	if (!hash)
+		return NULL;
+	hashcpy(oid->hash, hash);
+	return oid;
+}
+
+void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
+{
+	const unsigned char *ptr = vptr;
+	const unsigned char *start = p->index_data;
+	const unsigned char *end = start + p->index_size;
+	if (ptr < start)
+		die(_("offset before start of pack index for %s (corrupt index?)"),
+		    p->pack_name);
+	/* No need to check for underflow; .idx files must be at least 8 bytes */
+	if (ptr >= end - 8)
+		die(_("offset beyond end of pack index for %s (truncated index?)"),
+		    p->pack_name);
+}
+
+off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
+{
+	const unsigned char *index = p->index_data;
+	index += 4 * 256;
+	if (p->index_version == 1) {
+		return ntohl(*((uint32_t *)(index + 24 * n)));
+	} else {
+		uint32_t off;
+		index += 8 + p->num_objects * (20 + 4);
+		off = ntohl(*((uint32_t *)(index + 4 * n)));
+		if (!(off & 0x80000000))
+			return off;
+		index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
+		check_pack_index_ptr(p, index);
+		return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) |
+				   ntohl(*((uint32_t *)(index + 4)));
+	}
+}
+
+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");
+
+	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;
+	}
+	return 0;
+}
+
+int is_pack_valid(struct packed_git *p)
+{
+	/* An already open pack is known to be valid. */
+	if (p->pack_fd != -1)
+		return 1;
+
+	/* If the pack has one window completely covering the
+	 * file size, the pack is known to be valid even if
+	 * the descriptor is not currently open.
+	 */
+	if (p->windows) {
+		struct pack_window *w = p->windows;
+
+		if (!w->offset && w->len == p->pack_size)
+			return 1;
+	}
+
+	/* Force the pack to open to prove its valid. */
+	return !open_packed_git(p);
+}
+
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
+				  struct packed_git *packs)
+{
+	struct packed_git *p;
+
+	for (p = packs; p; p = p->next) {
+		if (find_pack_entry_one(sha1, p))
+			return p;
+	}
+	return NULL;
+
+}
+
+static int fill_pack_entry(const unsigned char *sha1,
+			   struct pack_entry *e,
+			   struct packed_git *p)
+{
+	off_t offset;
+
+	if (p->num_bad_objects) {
+		unsigned i;
+		for (i = 0; i < p->num_bad_objects; i++)
+			if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
+				return 0;
+	}
+
+	offset = find_pack_entry_one(sha1, p);
+	if (!offset)
+		return 0;
+
+	/*
+	 * We are about to tell the caller where they can locate the
+	 * requested object.  We better make sure the packfile is
+	 * still here and can be accessed before supplying that
+	 * answer, as it may have been deleted since the index was
+	 * loaded!
+	 */
+	if (!is_pack_valid(p))
+		return 0;
+	e->offset = offset;
+	e->p = p;
+	hashcpy(e->sha1, sha1);
+	return 1;
+}
+
+/*
+ * Iff a pack file contains the object named by sha1, return true and
+ * store its location to e.
+ */
+int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
+{
+	struct mru_entry *p;
+
+	prepare_packed_git();
+	if (!packed_git)
+		return 0;
+
+	for (p = packed_git_mru.head; p; p = p->next) {
+		if (fill_pack_entry(sha1, e, p->item)) {
+			mru_mark(&packed_git_mru, p);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+int has_sha1_pack(const unsigned char *sha1)
+{
+	struct pack_entry e;
+	return find_pack_entry(sha1, &e);
+}
+
+int has_pack_index(const unsigned char *sha1)
+{
+	struct stat st;
+	if (stat(sha1_pack_index_name(sha1), &st))
+		return 0;
+	return 1;
+}
+
+static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
+{
+	uint32_t i;
+	int r = 0;
+
+	for (i = 0; i < p->num_objects; i++) {
+		struct object_id oid;
+
+		if (!nth_packed_object_oid(&oid, p, i))
+			return error("unable to get sha1 of object %u in %s",
+				     i, p->pack_name);
+
+		r = cb(&oid, p, i, data);
+		if (r)
+			break;
+	}
+	return r;
+}
+
+int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
+{
+	struct packed_git *p;
+	int r = 0;
+	int pack_errors = 0;
+
+	prepare_packed_git();
+	for (p = packed_git; p; p = p->next) {
+		if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
+			continue;
+		if (open_pack_index(p)) {
+			pack_errors = 1;
+			continue;
+		}
+		r = for_each_object_in_pack(p, cb, data);
+		if (r)
+			break;
+	}
+	return r ? r : pack_errors;
+}
diff --git a/packfile.h b/packfile.h
new file mode 100644
index 000000000..0cdeb54dc
--- /dev/null
+++ b/packfile.h
@@ -0,0 +1,138 @@
+#ifndef PACKFILE_H
+#define PACKFILE_H
+
+/*
+ * Generate the filename to be used for a pack file with checksum "sha1" and
+ * extension "ext". The result is written into the strbuf "buf", overwriting
+ * any existing contents. A pointer to buf->buf is returned as a convenience.
+ *
+ * Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
+ */
+extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
+
+/*
+ * Return the name of the (local) packfile with the specified sha1 in
+ * its name.  The return value is a pointer to memory that is
+ * overwritten each time this function is called.
+ */
+extern char *sha1_pack_name(const unsigned char *sha1);
+
+/*
+ * Return the name of the (local) pack index file with the specified
+ * sha1 in its name.  The return value is a pointer to memory that is
+ * overwritten each time this function is called.
+ */
+extern char *sha1_pack_index_name(const unsigned char *sha1);
+
+extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
+
+/* A hook to report invalid files in pack directory */
+#define PACKDIR_FILE_PACK 1
+#define PACKDIR_FILE_IDX 2
+#define PACKDIR_FILE_GARBAGE 4
+extern void (*report_garbage)(unsigned seen_bits, const char *path);
+
+extern void prepare_packed_git(void);
+extern void reprepare_packed_git(void);
+extern void install_packed_git(struct packed_git *pack);
+
+/*
+ * Give a rough count of objects in the repository. This sacrifices accuracy
+ * for speed.
+ */
+unsigned long approximate_object_count(void);
+
+extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
+					 struct packed_git *packs);
+
+extern void pack_report(void);
+
+/*
+ * mmap the index file for the specified packfile (if it is not
+ * already mmapped).  Return 0 on success.
+ */
+extern int open_pack_index(struct packed_git *);
+
+/*
+ * munmap the index file for the specified packfile (if it is
+ * currently mmapped).
+ */
+extern void close_pack_index(struct packed_git *);
+
+extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
+extern void close_pack_windows(struct packed_git *);
+extern void close_all_packs(void);
+extern void unuse_pack(struct pack_window **);
+extern void clear_delta_base_cache(void);
+extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+
+/*
+ * Make sure that a pointer access into an mmap'd index file is within bounds,
+ * and can provide at least 8 bytes of data.
+ *
+ * Note that this is only necessary for variable-length segments of the file
+ * (like the 64-bit extended offset table), as we compare the size to the
+ * fixed-length parts when we open the file.
+ */
+extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
+
+/*
+ * 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
+ * error.
+ */
+extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
+/*
+ * Like nth_packed_object_sha1, but write the data into the object specified by
+ * the the first argument.  Returns the first argument on success, and NULL on
+ * error.
+ */
+extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
+
+/*
+ * Return the offset of the nth object within the specified packfile.
+ * The index must already be opened.
+ */
+extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
+
+/*
+ * If the object named sha1 is present in the specified packfile,
+ * return its offset within the packfile; otherwise, return 0.
+ */
+extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
+
+extern int is_pack_valid(struct packed_git *);
+extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
+extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
+extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
+extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+
+extern void release_pack_memory(size_t);
+
+/* global flag to enable extra checks when accessing packed objects */
+extern int do_check_packed_object_crc;
+
+extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);
+
+extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
+extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
+
+extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
+
+extern int has_sha1_pack(const unsigned char *sha1);
+
+extern int has_pack_index(const unsigned char *sha1);
+
+/*
+ * Iterate over packed objects in both the local
+ * repository and any alternates repositories (unless the
+ * FOR_EACH_OBJECT_LOCAL_ONLY flag, defined in cache.h, is set).
+ */
+typedef int each_packed_object_fn(const struct object_id *oid,
+				  struct packed_git *pack,
+				  uint32_t pos,
+				  void *data);
+extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
+
+#endif
diff --git a/pager.c b/pager.c
index 4dd9e1b26..92b23e6cd 100644
--- a/pager.c
+++ b/pager.c
@@ -194,7 +194,7 @@ static int pager_command_config(const char *var, const char *value, void *vdata)
 	const char *cmd;
 
 	if (skip_prefix(var, "pager.", &cmd) && !strcmp(cmd, data->cmd)) {
-		int b = git_config_maybe_bool(var, value);
+		int b = git_parse_maybe_bool(value);
 		if (b >= 0)
 			data->want = b;
 		else {
diff --git a/parse-options.c b/parse-options.c
index 0dd9fc6a0..fca715964 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -581,6 +581,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
 				       const struct option *opts, int full, int err)
 {
 	FILE *outfile = err ? stderr : stdout;
+	int need_newline;
 
 	if (!usagestr)
 		return PARSE_OPT_HELP;
@@ -599,12 +600,11 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
 		if (**usagestr)
 			fprintf_ln(outfile, _("    %s"), _(*usagestr));
 		else
-			putchar('\n');
+			fputc('\n', outfile);
 		usagestr++;
 	}
 
-	if (opts->type != OPTION_GROUP)
-		fputc('\n', outfile);
+	need_newline = 1;
 
 	for (; opts->type != OPTION_END; opts++) {
 		size_t pos;
@@ -612,6 +612,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
 
 		if (opts->type == OPTION_GROUP) {
 			fputc('\n', outfile);
+			need_newline = 0;
 			if (*opts->help)
 				fprintf(outfile, "%s\n", _(opts->help));
 			continue;
@@ -619,6 +620,11 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
 		if (!full && (opts->flags & PARSE_OPT_HIDDEN))
 			continue;
 
+		if (need_newline) {
+			fputc('\n', outfile);
+			need_newline = 0;
+		}
+
 		pos = fprintf(outfile, "    ");
 		if (opts->short_name) {
 			if (opts->flags & PARSE_OPT_NODASH)
diff --git a/patch-ids.c b/patch-ids.c
index b4166b0f3..7a583b301 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -35,11 +35,16 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
  * the side of safety.  The actual value being negative does not have
  * any significance; only that it is non-zero matters.
  */
-static int patch_id_cmp(struct diff_options *opt,
-			struct patch_id *a,
-			struct patch_id *b,
+static int patch_id_cmp(const void *cmpfn_data,
+			const void *entry,
+			const void *entry_or_key,
 			const void *unused_keydata)
 {
+	/* NEEDSWORK: const correctness? */
+	struct diff_options *opt = (void *)cmpfn_data;
+	struct patch_id *a = (void *)entry;
+	struct patch_id *b = (void *)entry_or_key;
+
 	if (is_null_oid(&a->patch_id) &&
 	    commit_patch_id(a->commit, opt, &a->patch_id, 0))
 		return error("Could not get patch ID for %s",
@@ -58,8 +63,7 @@ int init_patch_ids(struct patch_ids *ids)
 	ids->diffopts.detect_rename = 0;
 	DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
 	diff_setup_done(&ids->diffopts);
-	hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp,
-		     &ids->diffopts, 256);
+	hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 256);
 	return 0;
 }
 
diff --git a/path.c b/path.c
index 335d4dd87..2e09a7bce 100644
--- a/path.c
+++ b/path.c
@@ -9,6 +9,7 @@
 #include "worktree.h"
 #include "submodule-config.h"
 #include "path.h"
+#include "packfile.h"
 
 static int get_st_mode_bits(const char *path, int *mode)
 {
@@ -716,7 +717,7 @@ char *expand_user_path(const char *path, int real_home)
 			if (!home)
 				goto return_null;
 			if (real_home)
-				strbuf_addstr(&user_path, real_path(home));
+				strbuf_add_real_path(&user_path, home);
 			else
 				strbuf_addstr(&user_path, home);
 #ifdef GIT_WINDOWS_NATIVE
diff --git a/pathspec.c b/pathspec.c
index e2a23ebc9..cdefdc7cc 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -526,10 +526,6 @@ static void NORETURN unsupported_magic(const char *pattern,
 	    pattern, sb.buf);
 }
 
-/*
- * Given command line arguments and a prefix, convert the input to
- * pathspec. die() if any magic in magic_mask is used.
- */
 void parse_pathspec(struct pathspec *pathspec,
 		    unsigned magic_mask, unsigned flags,
 		    const char *prefix, const char **argv)
diff --git a/pathspec.h b/pathspec.h
index 60e650040..6420d1080 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -70,6 +70,13 @@ struct pathspec {
  */
 #define PATHSPEC_LITERAL_PATH (1<<6)
 
+/*
+ * Given command line arguments and a prefix, convert the input to
+ * pathspec. die() if any magic in magic_mask is used.
+ *
+ * Any arguments used are copied. It is safe for the caller to modify
+ * or free 'prefix' and 'args' after calling this function.
+ */
 extern void parse_pathspec(struct pathspec *pathspec,
 			   unsigned magic_mask,
 			   unsigned flags,
diff --git a/pkt-line.c b/pkt-line.c
index f364944b9..93ea31144 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -94,9 +94,9 @@ void packet_flush(int fd)
 int packet_flush_gently(int fd)
 {
 	packet_trace("0000", 4, 1);
-	if (write_in_full(fd, "0000", 4) == 4)
-		return 0;
-	return error("flush packet write failed");
+	if (write_in_full(fd, "0000", 4) < 0)
+		return error("flush packet write failed");
+	return 0;
 }
 
 void packet_buf_flush(struct strbuf *buf)
@@ -137,19 +137,18 @@ static int packet_write_fmt_1(int fd, int gently,
 			      const char *fmt, va_list args)
 {
 	static struct strbuf buf = STRBUF_INIT;
-	ssize_t count;
 
 	strbuf_reset(&buf);
 	format_packet(&buf, fmt, args);
-	count = write_in_full(fd, buf.buf, buf.len);
-	if (count == buf.len)
-		return 0;
-
-	if (!gently) {
-		check_pipe(errno);
-		die_errno("packet write with format failed");
+	if (write_in_full(fd, buf.buf, buf.len) < 0) {
+		if (!gently) {
+			check_pipe(errno);
+			die_errno("packet write with format failed");
+		}
+		return error("packet write with format failed");
 	}
-	return error("packet write with format failed");
+
+	return 0;
 }
 
 void packet_write_fmt(int fd, const char *fmt, ...)
@@ -184,9 +183,9 @@ static int packet_write_gently(const int fd_out, const char *buf, size_t size)
 	packet_size = size + 4;
 	set_packet_header(packet_write_buffer, packet_size);
 	memcpy(packet_write_buffer + 4, buf, size);
-	if (write_in_full(fd_out, packet_write_buffer, packet_size) == packet_size)
-		return 0;
-	return error("packet write failed");
+	if (write_in_full(fd_out, packet_write_buffer, packet_size) < 0)
+		return error("packet write failed");
+	return 0;
 }
 
 void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
@@ -259,7 +258,7 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
 	}
 
 	/* And complain if we didn't get enough bytes to satisfy the read. */
-	if (ret < size) {
+	if (ret != size) {
 		if (options & PACKET_READ_GENTLE_ON_EOF)
 			return -1;
 
diff --git a/po/TEAMS b/po/TEAMS
index b3184cb0c..cc5b235f0 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -20,6 +20,10 @@ Members:	Thomas Rast <tr@thomasrast.ch>
 		Matthias Rüster <matthias.ruester@gmail.com>
 		Magnus Görlitz <magnus.goerlitz@googlemail.com>
 
+Language:	es (Spanish)
+Repository:	https://github.com/ChrisADR/git-po
+Leader:		Christopher Díaz <christopher.diaz.riv@gmail.com>
+
 Language:	fr (French)
 Repository:	https://github.com/jnavila/git
 Leader:		Jean-Noël Avila <jn.avila@free.fr>
diff --git a/po/bg.po b/po/bg.po
index 19be17110..45bf4ccb2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -82,6 +82,8 @@
 # alternate алтернативен източник
 # superproject обхващащ проект
 # split index раздел�не на индек�а
+# truncate отр�звам
+# format string форматиращ низ
 # ------------------------
 # „$var“ - може да не �работва за shell има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ------------------------
@@ -94,8 +96,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git master\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-24 17:26+0200\n"
+"POT-Creation-Date: 2017-10-08 09:48+0800\n"
+"PO-Revision-Date: 2017-10-14 11:52+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -139,14 +141,14 @@ 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."
 msgstr ""
-"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm Ф�ЙЛ“\n"
+"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm Ф�ЙЛ“,\n"
 "за да отбележите коригирането им.  След това извършете подаването."
 
 #: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
@@ -197,90 +199,90 @@ msgstr "непозната опциÑ� за знаците за интервалÐ
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "непозната опци� за игнориране на знаците за интервали „%s“"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "опциите „--reject“ и „--3way“ �а не�ъвме�тими"
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "опциите „--cached“ и „--3way“ �а не�ъвме�тими"
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "като „--3way“, но извън хранилище"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "като „--index“, но извън хранилище"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "като „--cached“, но извън хранилище"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Регул�рни�т израз за времето „%s“ не може за бъде компилиран"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Регул�рни�т израз върна %d при подадена по�ледователно�т „%s“ на входа"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "Лип�ва име на файл на ред %d от кръпката"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %2$d �е очакваше „/dev/"
 "null“, а бе получен „%1$s“"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на нов файл"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
 "неправилно име на �тар файл"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply: лош изход от командата „git-diff“ — на ред %d �е очакваше „/dev/"
 "null“"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "грешен режим на ред №%d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "не�ъвме�тими заглавни ча�ти на редове №%d и №%d"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "при повторното пребро�ване бе получен неочакван ред: „%.*s“"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "ча�т от кръпка без заглавна ча�т на ред %d: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -295,71 +297,71 @@ msgstr[1] ""
 "След �ъкращаването на първите %d ча�ти от компонентите на път�, в заглавната "
 "ча�т на „git diff“ лип�ва информаци� за име на файл (ред: %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "в заглавната ча�т на „git diff“ лип�ва информаци� за име на файл (ред: %d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "нови�т файл зави�и от �тарото �ъдържание на файла"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "изтрити�т файл не е празен"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "грешка в кръпката на ред %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "нови�т файл „%s“ зави�и от �тарото �ъдържание на файла"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "изтрити�т файл „%s“ не е празен"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "� предупреждение: файлът „%s“ вече е празен, но не е изтрит"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "грешка в двоичната кръпка на ред %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неразпозната двоичната кръпка на ред %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "кръпката е � изц�ло повредени данни на ред %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправилно начало на ред: „%c“"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -368,13 +370,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-то парче код бе у�пешно приложено на ред %d (отме�тване от %d реда)."
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Контек�тът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -383,316 +385,316 @@ msgstr ""
 "при тър�ене за:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "лип�ват данните за двоичната кръпка за „%s“"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "двоичната кръпка не може да �е приложи в обратна по�ока, когато обратното "
 "парче за „%s“ лип�ва"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "към „%s“ не може да �е приложи двоична кръпка без пълен индек�"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "кръпката �ъответ�тва на „%s“ (%s), който не �ъвпада по �ъдържание."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "кръпката �ъответ�тва на „%s“, който тр�бва да е празен, но не е"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 "необходими�т резултат �лед операци�та  — „%s“ за „%s“ не може да бъде "
 "прочетен"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "двоичната кръпка за „%s“ води до неправилни резултати (очакваше �е: „%s“, а "
 "бе получено: „%s“)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "неу�пешно прилагане на кръпка: „%s:%ld“"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да �е изтегли"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ �лед про�лед�ване на �имволна връзка"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът � път „%s“ е преименуван или изтрит"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не �ъще�твува в индек�а"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не �ъответ�тва на индек�а"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "в хранилището лип�ват необходимите обекти BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Преминаване към тройно �ливане…\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "текущото �ъдържание на „%s“ не може да бъде прочетено"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "�еу�пешно преминаване към тройно �ливане…\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Кръпката бе приложена чи�то към „%s“.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка о�тав� файла непразен"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а �е очакваше „%o“"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправилен път: „%s“"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече �ъще�твува в индек�а"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече �ъще�твува в работното дърво"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o) на „%s“"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "за�егнати�т файл „%s“ е �лед �имволна връзка"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Провер�ване на кръпката „%s“…"
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "информаци�та за �умата по SHA1 за подмодула лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "�м�на на режима на до�тъпа на „%s“, който не е в текущи� връх „HEAD“"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци�та за �умата по SHA1 лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "„%s“ не може да �е добави към временни� индек�"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "временни�т индек� не може да �е запази в „%s“"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да �е извади от индек�а"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да �е получи информаци� чрез „stat“ за ново�ъздадени� файл „%s“"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да �е за �ъздаде м��тото за �ъхранение на ново�ъздадени� файл „%s“"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да �е добави запи� в кеша за „%s“"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "в „%s“ не може да �е пише"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "затвар�не на файла „%s“"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да �е запише � режим на до�тъп „%o“"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чи�то."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Прилагане на кръпката „%%s“ � %d отхвърлено парче…"
 msgstr[1] "Прилагане на кръпката „%%s“ � %d отхвърлени парчета…"
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе у�пешно приложено."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Пропу�ната кръпка: „%s“"
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "непознат вход"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "кръпката „%s“ не може да бъде отворена: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати �а %d грешки в знаците за интервали"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ред добав� грешки в знаците за интервали."
 msgstr[1] "%d реда добав�т грешки в знаците за интервали."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -701,138 +703,139 @@ msgstr[0] ""
 msgstr[1] ""
 "Добавени �а %d реда �лед корекци�та на грешките в знаците за интервали."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "�ови�т индек� не може да бъде запи�ан"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "път"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "без прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "БРОЙ"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "извеждане на �тати�тика на промените без прилагане на кръпката"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на бро� на добавените и изтритите редове"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на �тати�тика на входните данни без прилагане на кръпката"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да �е приложи, без дей�твително прилагане"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущи� индек�"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без пром�на на работното дърво"
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:4951
+#: apply.c:4977
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "пробване � тройно �ливане, ако кръпката не може да �е приложи директно"
 
-#: apply.c:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:4960
+#: apply.c:4986
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "повече подробно�ти"
 
-#: apply.c:4978
+#: apply.c:5004
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: apply.c:4981
+#: apply.c:5007
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "добав�не на тази ��Ч�Л��_ДИРЕКТОРИЯ към имената на в�ички файлове"
 
@@ -855,108 +858,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ХР��ИЛИЩЕ [--exec КОМ��Д�] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "път�т „%s“ не �ъвпада � никой файл"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "ФОРМ�Т"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добав�не на този ПРЕФИКС към в�еки път в архива"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "Ф�ЙЛ"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "запазване на архива в този Ф�ЙЛ"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "изчитане на „.gitattributes“ в работната директори�"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "извеждане на архивираните файлове на �тандартната грешка"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "�амо �ъхранение без компре�иране"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "бързо компре�иране"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "добро компре�иране"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "хранилище"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "изтегл�не на архива от отдалеченото ХР��ИЛИЩЕ"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "команда"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "път към отдалечената команда „git-upload-archive“"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "�еочаквана опци� „--remote“"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "Опци�та „--exec“ изи�ква „--remote“"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "�еочаквана опци� „--output“"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "�епознат формат на архив: „%s“"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�ргументът не �е поддържа за форма̀та „%s“: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "„%.*s“ е неправилно име за атрибут"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1033,31 +1036,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Двоично тър�ене: тр�бва да �е провери база за �ливане\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "необходима е вер�и� „%s“"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "неу�пешно прочитане на указателите за двоично тър�ене"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "„%s“ e както „%s“, така и „%s“\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1066,7 +1069,7 @@ msgstr ""
 "Лип�ва подход�що за те�тване подаване.\n"
 "Проверете параметрите за пътищата.\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1076,7 +1079,7 @@ msgstr[1] "(приблизително %d �тъпки)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1097,10 +1100,10 @@ msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на крайно подаване"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1932 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
 msgid "revision walk setup failed"
 msgstr "неу�пешно на�тройване на обхождането на вер�иите"
 
@@ -1142,45 +1145,44 @@ msgstr ""
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
-"Клонът „%s“ ще �леди клона „%s“ от отдалеченото хранилище „%s“ чрез "
+"Клонът „%s“ ще �леди отдалечени� клон „%s“ от хранилището „%s“ чрез "
 "пребазиране."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Клонът „%s“ ще �леди клона „%s“ от отдалеченото хранилище „%s“."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Клонът „%s“ ще �леди отдалечени� клон „%s“ от хранилището „%s“."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"Клонът „%s“ ще �леди клона „%s“ от локалното хранилище чрез пребазиране."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "Клонът „%s“ ще �леди локални� клон „%s“ чрез пребазиране."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Клонът „%s“ ще �леди клона „%s“ от локалното хранилище."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Клонът „%s“ ще �леди локални� клон „%s“."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“ чрез пребазиране."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr "Клонът „%s“ ще �леди локални� указател „%s“ чрез пребазиране."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
 msgstr "Клонът „%s“ ще �леди локални� указател „%s“."
 
 #: branch.c:119
@@ -1202,21 +1204,21 @@ msgstr "„%s“ не е позволено име за клон."
 msgid "A branch named '%s' already exists."
 msgstr "Вече �ъще�твува клон � име „%s“."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "Текущи�т клон не може да бъде принудително обновен."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr "Зададените на�тройки за �леденето �а грешни — началото „%s“ не е клон."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "за�вени�т отдалечен клон „%s“ не �ъще�твува"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1235,22 +1237,22 @@ msgstr ""
 "може да използвате „git push -u“, за да на�троите към кой клон да �е "
 "изтла�ква."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "�еправилно име на обект: „%s“"
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Името на обект не е еднозначно: „%s“"
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "�еправилно м��то за начало на клон: „%s“"
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "„%s“ вече е изтеглен в „%s“"
@@ -1270,7 +1272,9 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "„%s“ не може да �е отвори"
@@ -1279,57 +1283,57 @@ msgstr "„%s“ не може да �е отвори"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В хранилището лип�ват �ледните необходими подавани�:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Пратката �ъдържа �ледни� указател:"
 msgstr[1] "Пратката �ъдържа �ледните %d указатели:"
 
-#: bundle.c:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Пратката �ъдържа пълна и�тори�."
 
-#: bundle.c:195
+#: bundle.c:202
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Пратката изи�ква �ледни� указател:"
 msgstr[1] "Пратката изи�ква �ледните %d указатели:"
 
-#: bundle.c:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "Командата „git pack-objects“ не може да бъде �тартирана"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "Командата „git pack-objects“ не завърши у�пешно"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "Командата „git rev-list“ не завърши у�пешно"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "указател�т „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Създаването на празна пратка е невъзможно."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "Файлът „%s“ не може да бъде �ъздаден"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "Командата „git index-pack“ не завърши у�пешно"
 
@@ -1338,8 +1342,8 @@ msgstr "Командата „git index-pack“ не завърши у�пешн
 msgid "invalid color value: %.*s"
 msgstr "неправилна �тойно�т за цв�т: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "„%s“ не може да �е анализира"
@@ -1349,7 +1353,7 @@ msgstr "„%s“ не може да �е анализира"
 msgid "%s %s is not a commit!"
 msgstr "%s %s не е подаване!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1363,156 +1367,156 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "паметта �върши"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "отно�ителните у�ловни изрази за вмъкване тр�бва да идват от файлове"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB „%s“"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "неправилен ред за на�тройки %d във файла „%s“"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "неправилен ред за на�тройки %d на �тандартни� вход"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB за подмодул „%s“"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "неправилен ред за на�тройки %d на командни� ред „%s“"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "неправилен ред за на�тройки %d в „%s“"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "извън диапазона"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "неправилна мерна единица"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“: %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB „%s“: %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ във файла „%s“: %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на �тандартни� вход: %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на командни� ред „%s“: %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "домашната папка на потребител� не може да бъде открита: „%s“"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправилно ниво на компре�иране: %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправилно ниво на компре�иране при пакетиране: %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�еправилен %s: „%s“"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "непозната �тойно�т „%s“ за на�тройката „core.untrackedCache“. Ще �е ползва "
 "�тандартната �тойно�т „keep“ (запазване)"
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "�тойно�тта на „splitIndex.maxPercentChange“ тр�бва да е между 1 и 100, а не "
 "%d"
 
-#: config.c:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:2124
+#: config.c:2169
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "неу�пешно изпълнение на „fstat“ върху „%s“"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "„%s“ не може да �е зададе да е „%s“"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "„%s“ не може да �е премахне"
@@ -1533,19 +1537,19 @@ msgstr ""
 "Проверете дали то �ъще�твува и дали имате права\n"
 "за до�тъп."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Проверка на връзката"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "Командата „git rev-list“ не може да бъде изпълнена."
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "неу�пешен запи� на �пи�ъка � вер�иите"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен"
 
@@ -1658,29 +1662,38 @@ msgstr "файлът Ñ� подредбата на Ñ�ъответÑ�твиÑ�та â
 msgid "Performing inexact rename detection"
 msgstr "Тър�ене на преименувани� на обекти �ъчетани � промени"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "опци�та „%s“ изи�ква �тойно�т"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  �еу�пешно разпознаване на „%s“ като процент-праг за �тати�тиката по "
 "директории\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  �епознат параметър „%s“ за �тати�тиката по директории'\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"на�тройката за цв�т за преме�тване тр�бва да е една от: „no“ (без), "
+"„default“ (�тандартно), „zebra“ (райе), „dimmed_zebra“ (притъмнено райе), "
+"„plain“ (обикновено)"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „diff.submodule“"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1689,23 +1702,23 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно.  Спиране на работата при „%s“"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ �а не�ъвме�тими "
 "една � друга"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "Опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1714,230 +1727,234 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "�еразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: diff.c:4716
+#: diff.c:5505
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "тър�енето на преименувани� на обекти �ъчетани � промени �е пре�кача поради "
 "многото файлове."
 
-#: diff.c:4719
+#: diff.c:5508
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "у�тановени �а точните копи� на променените пътища поради многото файлове."
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "Кеша за не�ледените файлове е изключен на тази �и�тема или ме�тоположение."
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "директори�та на git не може да �е мигрира от „%s“ до „%s“"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Филтриране на �ъдържанието"
+
+#: entry.c:417
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху файла „%s“"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: очаква �е плитък �пи�ък"
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: очакваше �е „ACK“/„NAK“, а бе получен „EOF“"
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "отдалечена грешка: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: очакваше �е „ACK“/„NAK“, а бе получен „%s“"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "опци�та „--stateless-rpc“ изи�ква  „multi_ack_detailed“"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправилен плитък ред: „%s“"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправилен неплитък ред: „%s“"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "обектът „%s“ лип�ва"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "грешка в обекта: „%s“"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "не е открит плитък обект: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "очаква �е плитък или не обект, а бе получено: %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено бе %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "неправилно подаване: „%s“"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "преу�танов�ване"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "дей�твието завърши"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено бе %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Отбел�зване на „%s“ като пълно"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "вече има „%s“ (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за демултиплек�ора"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "протоколна грешка: неправилна заглавна ча�т на пакет"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за „%s“"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "грешка в демултиплек�ора"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Сървърът не поддържа плитки клиенти"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Сървърът поддържа „multi_ack_detailed“"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Сървърът поддържа „no-done“"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Сървърът поддържа „multi_ack“"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Сървърът поддържа „side-band-64k“"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Сървърът поддържа „side-band“"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Сървърът поддържа „ofs-delta“"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и�та на �ървъра е: %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Сървърът не поддържа опци�та „--shallow-since“"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Сървърът не поддържа опци�та „--shallow-exclude“"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Сървърът не поддържа опци�та „--deepen“"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "н�ма общи подавани�"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: неу�пешно до�тав�не."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "не може да бъде открит подход�щ връх от отдалеченото хранилище"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "такъв отдалечен указател н�ма: %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сървърът не позвол�ва за�вка за необ�вен „%s“"
@@ -1950,7 +1967,7 @@ msgstr "Програмата „gpg“ не подпи�а данните."
 msgid "could not create temporary file"
 msgstr "не може да �е �ъздаде временен файл"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Програмата не у�п� да запише �амо�то�телни� подпи� в „%s“"
@@ -1960,20 +1977,20 @@ msgstr "Програмата не уÑ�пÑ� да запише Ñ�амоÑ�тоÑ�Ñ‚Ð
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "пре�качане на неправилни� цв�т „%.*s“ в „log.graphColors“"
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
-msgstr "„%s“: изчитането върна по-малко байтове от за�вените"
+msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
 
 #: help.c:179
 #, c-format
@@ -2120,12 +2137,12 @@ msgstr "не може да �е ползва празно име като иде
 msgid "name consists only of disallowed characters: %s"
 msgstr "името �ъдържа �амо непозволени знаци: „%s“"
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправилен формат на дата: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2144,7 +2161,7 @@ msgstr ""
 "причина е, че н�кой проце� на git в това хранилище е забил.  За да\n"
 "продължите работа, ще тр�бва ръчно да изтриете файла:"
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Файлът-ключалка „%s.lock“ не може да бъде �ъздаден: %s"
@@ -2153,80 +2170,80 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде
 msgid "failed to read the cache"
 msgstr "кешът не може да бъде прочетен"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "неу�пешно запи�ване на нови� индек�"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(лошо подаване)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "неу�пешно изпълнение на „addinfo_cache“ за път� „%s“"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "грешка при изграждане на дърветата"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "грешка при �ъздаването на път� „%s“%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Изтриване на „%s“, за да �е о�вободи м��то за поддиректори�\n"
 
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": възможно е да има конфликт директори�/файл."
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "преу�танов�ване на дей�твието, за да не �е изтрие не�ледени�т файл „%s“"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "обектът „%s“ (%s) не може да бъде прочетен"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "обектът „%s“ (%s) �е очакваше да е BLOB, а не е"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "неу�пешно �ъздаване на �имволната връзка „%s“: %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "не е ��но какво да �е прави � обекта „%2$s“ (%3$s) � права за до�тъп „%1$06o“"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "�еу�пешно вътрешно �ливане"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "„%s“ не може да �е добави в базата � данни"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2235,7 +2252,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото."
 
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2244,7 +2261,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото."
 
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2253,7 +2270,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2262,20 +2279,20 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "преименуване"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "преименуван"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "„%s“ е директори� в „%s“, затова �е добав� като „%s“"
 
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2284,143 +2301,143 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (некоригиран конфликт)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
 
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "„%s“ е добавен в „%s“"
 
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Добав�не на �лети� „%s“"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добав�не като „%s“"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "обектът „%s“ не е BLOB"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "пром�на"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "променен"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "�ъдържание"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "добав�не/добав�не"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пре�качане на „%s“ (�лети�т резултат е идентичен �ъ� �егашни�)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�втоматично �ливане на „%s“"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "ПОДМОДУЛ"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "Изтриване на „%s“"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "файл/директори�"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "директори�/файл"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Добав�не на „%s“"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Вече е обновено!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "неу�пешно �ливане на дърветата „%s“ и „%s“"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Сливане:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "открит е %u общ предше�твеник:"
 msgstr[1] "открити �а %u общи предше�твеници:"
 
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "�ливането не върна подаване"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2437,7 +2454,7 @@ msgstr ""
 "\n"
 "    git notes merge --abort"
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
@@ -2468,16 +2485,35 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Зададена е лоша �тойно�т на променливата „%s“: „%s“"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "обектът „%s“ не може да бъде анализиран"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+"отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
+"индек�ът да е повреден)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"отме�тване преди кра� на индек�а на пакетни� файл „%s“ (възможно е индек�ът "
+"да е отр�зан)"
+
 #: parse-options.c:573
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
@@ -2485,17 +2521,17 @@ msgstr "употреба: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
@@ -2504,7 +2540,7 @@ msgstr "-ЧИСЛО"
 msgid "malformed object name '%s'"
 msgstr "неправилно име на обект „%s“"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е могат да �е дадат права за запи� в директори�та „%s“ на групата"
@@ -2578,7 +2614,7 @@ msgstr "„%s“ (клавиш: „%c“)"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�ките пътища не �е поддържат от командата „%s“"
 
-#: pathspec.c:575
+#: 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"
@@ -2587,12 +2623,12 @@ msgstr ""
 "�ледващи вер�ии на Git.  �ко и�кате �ъвпадение � в�ички пътища, използвайте: "
 "„.“"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "път�т „%s“ е �лед �имволна връзка"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "аргументът към опци�та „--pretty“ не може да �е анализира"
 
@@ -2615,50 +2651,51 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "„%s“ не може да �е затвори"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху „%s“"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не може да �е отвори директори�та на git: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
-#: refs.c:1769
+#: refs.c:1779
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "обнов�вани�та на указатели �а забранени в �реди под карантина"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "Указател�т „%s“ не може да бъде изтрит"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Указателите не може да бъдат изтрити: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Указател�т „%s“ не може да бъде изтрит"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "изтрит"
@@ -2678,157 +2715,157 @@ msgstr "назад � %d"
 msgid "ahead %d, behind %d"
 msgstr "напред � %d, назад � %d"
 
-#: ref-filter.c:105
+#: ref-filter.c:104
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "очакван формат: %%(color:ЦВЯТ)"
 
-#: ref-filter.c:107
+#: ref-filter.c:106
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "непознат цв�т: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:126
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:lstrip=%s“"
 
-#: ref-filter.c:125
+#: ref-filter.c:130
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:rstrip=%s“"
 
-#: ref-filter.c:127
+#: ref-filter.c:132
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "непознат аргумент за „%%(%s)“: %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:172
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) не приема аргументи"
 
-#: ref-filter.c:174
+#: ref-filter.c:179
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) не приема аргументи"
 
-#: ref-filter.c:181
+#: ref-filter.c:186
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "%%(trailers) не приема аргументи"
 
-#: ref-filter.c:200
+#: ref-filter.c:205
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "очаква �е положителна �тойно�т за „contents:lines=%s“"
 
-#: ref-filter.c:202
+#: ref-filter.c:207
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "непознат аргумент за %%(contents): %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:220
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "очаква �е положителна �тойно�т за „objectname:short=%s“"
 
-#: ref-filter.c:219
+#: ref-filter.c:224
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "непознат аргумент за %%(objectname): %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:251
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "очакван формат: %%(align:ШИРОЧИ��,ПОЗИЦИЯ)"
 
-#: ref-filter.c:258
+#: ref-filter.c:263
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "непозната позици�: %s"
 
-#: ref-filter.c:262
+#: ref-filter.c:267
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "непозната широчина: %s"
 
-#: ref-filter.c:268
+#: ref-filter.c:273
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "непознат аргумент за %%(align): %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:277
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "очаква �е положителна широчина � лек�емата „%%(align)“"
 
-#: ref-filter.c:287
+#: ref-filter.c:292
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "непознат аргумент за „%%(if)“: %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:382
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправилно име на обект: „%.*s“"
 
-#: ref-filter.c:404
+#: ref-filter.c:408
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "непознато име на обект: „%.*s“"
 
-#: ref-filter.c:508
+#: ref-filter.c:520
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "формат: лек�емата %%(if) е използвана без �ъответната � %%(then)"
 
-#: ref-filter.c:568
+#: ref-filter.c:580
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "формат: лек�емата %%(then) е използвана без �ъответната � %%(if)"
 
-#: ref-filter.c:570
+#: ref-filter.c:582
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: лек�емата %%(then) е използвана повече от един път"
 
-#: ref-filter.c:572
+#: ref-filter.c:584
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: лек�емата %%(then) е използвана �лед %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:610
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(if)"
 
-#: ref-filter.c:600
+#: ref-filter.c:612
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(then)"
 
-#: ref-filter.c:602
+#: ref-filter.c:614
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: лек�емата %%(else) е използвана повече от един път"
 
-#: ref-filter.c:615
+#: ref-filter.c:627
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: лек�емата %%(end) е използвана без �ъответната �"
 
-#: ref-filter.c:670
+#: ref-filter.c:682
 #, c-format
 msgid "malformed format string %s"
-msgstr "неправилен низ за форматиране „%s“"
+msgstr "неправилен форматиращ низ „%s“"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1268
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(извън клон, пребазиране на „%s“)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1271
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(извън клон, двоично тър�ене от „%s“)"
@@ -2836,7 +2873,7 @@ msgstr "(извън клон, двоично тър�ене от „%s“)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1279
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(Указател�т „HEAD“ не е �вързан и е при „%s“)"
@@ -2844,110 +2881,110 @@ msgstr "(Указател�т „HEAD“ не е �вързан и е при „
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1286
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от „%s“"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1290
 msgid "(no branch)"
 msgstr "(извън клон)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1439 ref-filter.c:1470
 #, c-format
 msgid "missing object %s for %s"
 msgstr "обектът „%s“ лип�ва за „%s“"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1442 ref-filter.c:1473
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "неу�пешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1773
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "обект �ъ� �грешен формат при „%s“"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1840
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнориране на указател� � грешно име „%s“"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1845
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнориране на повредени� указател „%s“"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2107
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2201
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: remote.c:747
+#: remote.c:750
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�евъзможно е да �е до�тав�т едновременно и „%s“, и „%s“ към „%s“"
 
-#: remote.c:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "„%s“ обикновено �леди „%s“, а не „%s“"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "„%s“ �леди както „%s“, така и „%s“"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "Указател�т „HEAD“ не �очи към клон"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "н�ма клон на име „%s“"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "не е зададен клон-източник за клона „%s“"
 
-#: remote.c:1698
+#: remote.c:1699
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "клонът-източник „%s“ не е �ъхранен като �лед�щ клон"
 
-#: remote.c:1713
+#: remote.c:1714
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "лип�ва локален �лед�щ клон за ме�тоположението за изтла�кване „%s“ в "
 "хранилището „%s“"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "н�ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "указател�т за изтла�кване на „%s“ не включва „%s“"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "указател�т за изтла�кване не включва цел („push.default“ е „nothing“)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "про�тото (simple) изтла�кване не �ъответ�тва на една цел"
 
@@ -2962,7 +2999,7 @@ msgstr "  (за да коригирате това, използвайте „gi
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "Клонът е актуализиран към „%s“.\n"
 
 #: remote.c:2087
@@ -3007,16 +3044,16 @@ msgstr[1] ""
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (�лейте отдалечени� клон в локални� чрез „git pull“)\n"
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опциите „--first-parent“ и „--bisect“ �а не�ъвме�тими"
 
@@ -3059,24 +3096,24 @@ msgstr "получаващата �трана не поддържа изтла�
 msgid "the receiving end does not support push options"
 msgstr "от�рещната �трана не поддържа опции при изтла�кване"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "отм�на"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "отбиране"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "�еизве�тно дей�твие: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3084,7 +3121,7 @@ msgstr ""
 "�лед коригирането на конфликтите, отбележете �ъответните\n"
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“."
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3094,42 +3131,43 @@ msgstr ""
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“, �лед което\n"
 "подайте резултата � командата „git commit'“."
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "„%s“ не може да �е заключи"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "в „%s“ не може да �е пише"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "кра�т на ред не може да �е запише в „%s“"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "„%s“ не може да �е завърши."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "локалните ви промени ще бъдат презапи�ани при %s."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr "подайте или �катайте промените, за да продължите"
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: превъртане"
@@ -3137,20 +3175,20 @@ msgstr "%s: превъртане"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "подаването �очено от указател� „HEAD“ не може да бъде открито\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "дървото на кеша не може да бъде обновено\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3179,17 +3217,17 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "подаването „%s“ не може да бъде анализирано\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "родител�кото подаване „%s“ не може да бъде анализирано\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3200,7 +3238,7 @@ msgstr ""
 "\n"
 "    %.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3211,239 +3249,240 @@ msgstr ""
 "\n"
 "    %.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Това е обединение от %d подавани�"
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "За �мачкване ви тр�бва указател „HEAD“"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "указател�т „HEAD“ не може да �е прочете"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr ""
 "�ъобщението за подаване към указател� „HEAD“ не може да бъде прочетено: %s"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "„%s“ не може да �е запази"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Това е 1-то �ъобщение при подаване:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде прочетено"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Това е �ъобщение при подаване №%d:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Съобщение при подаване №%d ще бъде пре�кочено:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "непозната команда: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "индек�ът не е �л�т."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "указано е базово подаване, но подаването „%s“ не е �ливане."
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "„%s“ не може да �е преименува на „%s“"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправилен ред %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „%s“"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "от „%s“ не може да �е чете."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "коригирайте това чрез „git rebase --edit-todo“."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "неизползваем файл � опи�ание на пред�то�щите дей�тви�: „%s“"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "никое от подавани�та не може да �е разпознае."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "по време на отм�на на подаване не може да �е извърши отбиране на подаване."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши отм�на на подаване."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "неправилен ключ: „%s“"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "неправилен файл � опции: „%s“"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 "в момента вече �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "директори�та за �еквен�ора „%s“ не може да бъде �ъздадена"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "указател�т „HEAD“ не може да �е заключи"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "„%s“ не може да бъде отворен"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "„%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Изглежда указател�т „HEAD“ е променен.  Проверете към какво �очи.\n"
 "�е �е прав�т промени."
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "указател�т „HEAD“ не може да бъде прочетен"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3458,11 +3497,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и промени индек�а и/или работното дърво\n"
 
-#: sequencer.c:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3479,17 +3518,17 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�втоматично �катаното е приложено.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "„%s“ не може да бъде запазен"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3500,57 +3539,57 @@ msgstr ""
 "надеждно �катани.  Можете да пробвате да ги приложите чрез „git stash pop“\n"
 "или да ги изхвърлите чрез „git stash drop“, когато пои�кате.\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Спиране при „%s“…  %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "непозната команда %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "указател�т за „orig-head“ не може да �е прочете"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "указател�т за „onto“ не може да �е прочете"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "„%s“ не може да �е обнови"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "„HEAD“ не може да бъде обновен до „%s“"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не може да пребазирате, защото има промени, които не �а в индек�а."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "не�ъще�твуващо подаване не може да �е поправи"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "неправилен файл: „%s“"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "неправилно �ъдържание: „%s“"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3560,24 +3599,111 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "промените в индек�а не могат да бъдат подадени."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "първоначалното подаване не може да бъде отменено"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: неподдържани опции"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: грешка при подготовката на вер�ии"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "неу�пешно изтриване на �пи�ъка за изпълнение: „%s“"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запи�"
+
+#: sequencer.c:2561
+#, c-format
+msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"�епозната �тойно�т „%s“ за на�тройката „optionrebase.missingCommitsCheck“.  "
+"�а�тройката �е пре�кача."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Предупреждение: н�кои подавани� може да �а пропу�нати.\n"
+"Пропу�нати подавани� (новите �а най-отгоре):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"За да не получавате това �ъобщение, изрично ползвайте командата „drop“.\n"
+"\n"
+"�а�тройката „rebase.missingCommitsCheck“ управл�ва нивото на предупреждение\n"
+"Възможните �тойно�ти �а „ignore“ (пренебрегване), „warn“ (�амо "
+"предупреждение)\n"
+"или „error“ (�читане за грешка).\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Може да промените това � командите „git rebase --edit-todo“ и „git rebase --"
+"continue“ �лед това.\n"
+"Може и да преу�тановите пребазирането � командата „git rebase --abort“.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "подаването „%s“ не може да бъде анализирано"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запи�"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "неу�пешно отр�зване чрез „truncate“ върху „%s“"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "�криптът вече е преподреден."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "„%s“ не може да �е завърши"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3614,36 +3740,36 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "открити �а непознати разширени� в хранилището:"
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr ""
 "�ито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
 "git: %s"
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "Проце�ът не може да �е върне към предишната работна директори�"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "Текущата работна директори� не може да бъде прочетена"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "�е може да �е влезе в директори�та „%s“"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3654,7 +3780,7 @@ msgstr ""
 "Git работи в рамките на една файлова �и�тема, защото променливата на �редата "
 "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3664,60 +3790,41 @@ msgstr ""
 "(0%.3o).\n"
 "Соб�твеникът на файла тр�бва да има права за пи�ане и четене."
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "път�т „%s“ не �ъще�твува."
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "еталонното хранилище „%s“ не е локално"
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "еталонното хранилище „%s“ е плитко"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "еталонното хранилище „%s“ е � при�аждане"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-"отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-"отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
-"индек�ът да е повреден)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-"отме�тване преди кра� на индек�а на пакетни� файл „%s“ (възможно е индек�ът "
-"да е отр�зан)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "къ�и�т SHA1 „%s“ не е еднозначен"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Възможно�тите �а:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3741,66 +3848,71 @@ msgstr ""
 "�прете това �ъобщение като изпълните командата:\n"
 "„git config advice.objectNameWarning false“"
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "�е�летите файлове „.gitmodules“ не могат да бъдат промен�ни.  Първо "
 "коригирайте конфликтите"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Във файла „.gitmodules“ лип�ва раздел за директори� „path=%s“"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде променен"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "неу�пешно добав�не на променени� файл „.gitmodules“ в индек�а"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "�а�тройката „submodule.fetchJobs“ не приема отрицателни �тойно�ти"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "в неподготвени� подмодул „%s“"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Път�т „%s“ е в подмодула „%.*s“"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "запи�ът за подмодула „%s“ (%s) е %s, а не подаване!"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "„%s“ не е хранилище на git"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "индек�ът на подмодула „%s“ не е чи�т"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3808,18 +3920,18 @@ msgstr ""
 "не �е поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
 "работно дърво"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "името на подмодула „%s“ не може да бъде намерено"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3830,94 +3942,98 @@ msgstr ""
 "„%s“ към\n"
 "„%s“\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "неу�пешна обработка на поддиректориите в подмодула „%s“"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "„ls-stat“ не може да �е �тартира в „..“"
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ГРЕШК�: получени�т низ за път� не �ъвпада � върнатото от „cwd“"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "„ls-tree“ завърши � неочакван изходен код: %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "на�тройката „submodule.fetchjobs“ не приема отрицателни �тойно�ти"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "�еправилна �тойно�т за „%s“"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "неу�пешно изпълнение на завършващата команда „%s“"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "непозната �тойно�т „%s“ за на�тройката „%s“"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "�тойно�тта „%s“ �е повтар� в на�тройките"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "празна завършваща лек�ема в епилога „%.*s“"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "входни�т файл „%s“ не може да бъде прочетен"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "от �тандартни� вход не може да �е чете"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "�е може да �е получи информаци� чрез „stat“ за „%s“"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "„%s“ не е обикновен файл"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "„%s“: н�ма права за запи�ване на файла"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "временни�т файл не може да �е отвори"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "временни�т файл не може да �е преименува на „%s“"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Клонът „%s“ ще �леди „%s“ от „%s“\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: неправилна опци� за дълбочина: %s"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3926,7 +4042,7 @@ msgstr ""
 "Следните пътища за подмодули �ъдържат промени,\n"
 "които лип�ват от в�ички отдалечени хранилища:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3951,7 +4067,7 @@ msgstr ""
 "    git push\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Преу�танов�ване на дей�твието."
 
@@ -3972,11 +4088,11 @@ msgstr "неправилни права за доÑ�тъп в запиÑ� в дъÑ
 msgid "empty filename in tree entry"
 msgstr "празно име на файл в запи� в дърво"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "прекалено кратък файл-дърво"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3985,7 +4101,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да преминете към нов клон."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3994,7 +4110,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4003,7 +4119,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"
@@ -4012,7 +4128,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4021,7 +4137,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да извършите „%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"
@@ -4030,7 +4146,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4039,7 +4155,7 @@ msgstr ""
 "Обнов�ването на �ледните директории ще изтрие не�ледените файлове в т�х:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4048,7 +4164,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"
@@ -4057,7 +4173,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4066,7 +4182,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"
@@ -4075,7 +4191,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4084,7 +4200,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4093,7 +4209,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4103,7 +4219,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �мените клон."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4113,7 +4229,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4122,7 +4238,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"
@@ -4131,7 +4247,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4140,7 +4256,7 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4149,22 +4265,22 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ът за „%s“ �ъвпада � този за „%s“.  �е може да �е при�вои."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 "Ча�тичното изтегл�не не може да бъде обновено: �ледните запи�и не �а "
 "актуални:\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4175,7 +4291,7 @@ msgstr ""
 "дърво:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4186,7 +4302,7 @@ msgstr ""
 "дърво:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4195,17 +4311,12 @@ msgstr ""
 "Подмодулът не може да бъде обновен:\n"
 "„%s“"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Преу�танов�ване на дей�твието\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "подмодулът „%s“ не поддържа �тратеги�та за обнов�ване като подмодул"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "Изтегл�не на файлове"
 
@@ -4248,13 +4359,8 @@ msgstr "„%s“ не може да бъде прочетен"
 msgid "could not open '%s' for reading and writing"
 msgstr "„%s“ не може да бъде отворен и за четене, и за запи�"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запи�"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "файлът не може да бъде прочетен: „%s“"
@@ -4278,205 +4384,205 @@ msgstr "„%s“ не може да бъде запи�ан"
 msgid "could not close %s"
 msgstr "„%s“ не може да �е затвори"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "�е�лети пътища:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (използвайте „git reset %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (използвайте „git rm --cached %s Ф�ЙЛ…“, за да извадите Ф�ЙЛа от индек�а)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, �поред решението, което избирате за "
 "конфликта)"
 
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:224
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (използвайте „git add/rm Ф�ЙЛ…“, за да обновите �ъдържанието за подаване)"
 
-#: wt-status.c:225
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (използвайте „git checkout -- Ф�ЙЛ…“, за да отхвърлите промените в "
 "работното дърво)"
 
-#: wt-status.c:227
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (подайте или отхвърлете не�леденото или промененото �ъдържание в "
 "подмодулите)"
 
-#: wt-status.c:239
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (използвайте „git %s Ф�ЙЛ…“, за да определите какво включвате в подаването)"
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "изтрити в двата �луча�:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "добавени от ва�:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "изтрити от т�х:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "добавени от т�х:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "изтрити от ва�:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "добавени и в двата �луча�:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "променени и в двата �луча�:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "нов файл:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "копиран:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "изтрит:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "променен:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "преименуван:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "�м�на на вида:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "непозната пром�на:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "не�л�т:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "нови подавани�, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "променено �ъдържание, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"�е промен�йте горни� ред.\n"
+"�е промен�йте и не изтривайте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (използвайте „git merge --abort“, за да преу�тановите �ливането)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (използвайте „git am --abort“, за да въз�тановите първоначални� клон)"
@@ -4780,7 +4886,7 @@ msgstr "о�вен това в индек�а има неподадени про
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не може да извършите „%s“, защото в индек�а има неподадени промени."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "неу�пешно изтриване на „%s“"
@@ -4794,7 +4900,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "неу�пешно обнов�ване на файловете"
 
@@ -4803,114 +4909,114 @@ msgstr "неу�пешно обнов�ване на файловете"
 msgid "remove '%s'\n"
 msgstr "изтриване на „%s“\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Промени, които и �лед обнов�ването на индек�а не �а добавени към него:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Файлът „%s“ не може да бъде отворен за запи�."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "Кръпката не може да бъде запи�ана"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "неу�пешно редактиране на кръпка"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е може да �е получи информаци� чрез „stat“ за файла „%s“"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Празна кръпка, преу�танов�ване на дей�твието."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "пробно изпълнение"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "интерактивно отбиране на промени"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "редактиране на текущата разлика и прилагане"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "добав�не и на иначе игнорираните файлове"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "обнов�ване на �ледените файлове"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "отбел�зване �амо на факта, че път�т ще бъде добавен по-къ�но"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "добав�не на в�ички промени в �ледените и не�ледените файлове"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "игнориране на пътищата, които �а изтрити от работното дърво (�ъщото като „--"
 "no-all“)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "без добав�не на нови файлове, �амо обнов�ване на индек�а"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "пре�качане на файловете, които не могат да бъдат добавени поради грешки"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "проверка, че при пробно изпълнение в�ички файлове, дори и изтритите, �е "
 "игнорират"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на �тойно�тта на флага дали файлът е изпълним"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "предупреждаване при добав�не на вградено хранилище"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4927,10 +5033,8 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"Изтеглили �те допълнително хранилище в текущото.  Когато клонирате "
-"обхващащото\n"
-"хранилище н�ма да получити вграденото, защото външното хранилище н�ма "
-"пред�тава\n"
+"Изтеглили �те допълнително хранилище в текущото.  Когато клонирате обхващащото\n"
+"хранилище н�ма да получите вграденото, защото външното хранилище н�ма пред�тава\n"
 "за вътрешното.  За да добавите подмодул, изпълнете:\n"
 "\n"
 "    git submodule add �ДРЕС %s\n"
@@ -4941,152 +5045,152 @@ msgstr ""
 "\n"
 "За повече информаци� погледнете „git help submodule“."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добав�не на вградено хранилище: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Използвайте опци�та „-f“, за да ги добавите наи�тина.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "неу�пешно добав�не на файлове"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "опциите „-A“ и „-u“ �а не�ъвме�тими"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Опци�та „--ignore-missing“ е �ъвме�тима �амо � „--dry-run“"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ищо не е зададено и нищо не е добавено.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Веро�тно и�кахте да използвате „git add .“?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "�криптът за автор не може да �е анализира"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Дадени�т входен ред е � неправилен формат: „%s“."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да �е копира от „%s“ към „%s“"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "неу�пешно изпълнение на „fseek“"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да �е анализира"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една �ери� кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "неправилна �тойно�т за време"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "неправилно отме�тване на ча�ови� по��"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "Кръпките не могат да бъдат разделени."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "След коригирането на този проблем изпълнете „%s --continue“."
 
-#: builtin/am.c:1172
+#: builtin/am.c:1194
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "�ко предпочитате да пре�кочите тази кръпка, изпълнете „%s --skip“."
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "За да �е върнете към първоначалното �ъ�то�ние, изпълнете „%s --abort“."
 
-#: builtin/am.c:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Кръпката е празна."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред � идентично�т: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "подаването не може да бъде анализирано: %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5094,39 +5198,39 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "обектът за подаването не може да бъде запи�ан"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "За интерактивно изпълнение е необходимо �тандартни�т\n"
 "вход да е �вързан � терминал, а в момента не е."
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -5134,38 +5238,38 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
 "на в�ичко:"
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не могат да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Дубликат на проблемната кръпка �е намира в: %s"
 
-#: builtin/am.c:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5175,7 +5279,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5186,17 +5290,17 @@ msgstr ""
 "След корекци� на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от т�х“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5207,139 +5311,138 @@ msgstr ""
 "�очи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�)…]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добав�не на ред за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ незави�имо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "прекарване през „git-apply“"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "ФОРМ�Т"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "�иноними на „--continue“"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
 "прилагането на кръпката."
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_КЛЮЧ"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(ползва �е вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5347,18 +5450,18 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще.  �е ги ползвайте."
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5367,7 +5470,7 @@ msgstr ""
 "Открита е излишна директори� „%s“.\n"
 "Можете да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
@@ -5590,14 +5693,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТ�Р_КЛО�] �ОВ_КЛО�"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [ОПЦИЯ…] (-c | -C) [СТ�Р_КЛО�] �ОВ_КЛО�"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5606,7 +5713,7 @@ msgstr ""
 "изтриване на клона „%s“, който е �л�т към „%s“,\n"
 "    но още не е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5615,12 +5722,12 @@ msgstr ""
 "отказване на изтриване на клона „%s“, който не е �л�т към\n"
 "    „%s“, но е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Обектът-подаване за „%s“ не може да бъде открит"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5629,92 +5736,113 @@ msgstr ""
 "Клонът „%s“ не е �л�т напълно.  �ко �те �игурни, че и�кате\n"
 "да го изтриете, изпълнете „git branch -D %s“."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "�еу�пешно обнов�ване на конфигурационни� файл"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "Опци�та „-a“ е не�ъвме�тима � опци�та „-d“"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Обектът-подаване, �очен от указател� „HEAD“, не може да бъде открит"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "�е можете да изтриете клона „%s“, който е изтеглен в път� „%s“"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "�лед�щи�т клон „%s“ не може да бъде открит."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "клонът „%s“ не може да бъде открит."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Грешка при изтриването на �лед�щи� клон „%s“"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Грешка при изтриването на клона „%s“"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Изтрит �лед�щ клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Изтрит клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "форматиращи�т низ не може да бъде анализиран: %s"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Клонът „%s“ �е пребазира върху „%s“"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Тър�и �е двоично в клона „%s“ при „%s“"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "не можете да копирате текущи� клон, защото �те извън който и да е клон"
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "не можете да преименувате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�еправилно име на клон: „%s“"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "�еу�пешно преименуване на клон"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "�еу�пешно копиране на клон"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Клонът � неправилно име „%s“ е копиран"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
-msgstr "�а клона � неправилно име „%s“ е дадено �лужебно име"
+msgstr "Клонът � неправилно име „%s“ е преименуван"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указател�т „HEAD“ не е обновен"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Клонът е копиран, но конфигурационни�т файл не е обновен"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5725,179 +5853,187 @@ msgstr ""
 "  %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Общи на�тройки"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на хеша и темата.  Повтар�нето на опци�та прибав� отдалечените "
 "клони"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "задаване на режима на �ледене (виж git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "�м�на на �ледени� клон"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "да не �е ползва"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "клон-източник"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "�м�на на клона-източник"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "без клон-източник"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "дей�твие върху �лед�щите клони"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "извеждане �амо на клоните, които �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "извеждане �амо на клоните, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Специални дей�тви� на „git-branch“:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на �лед�щите, така и на локалните клони"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които �а напълно �лети"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не �а напълно �лети"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преме�тване/преименуване на клон и принадлежащи�т му журнал на указателите"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "преме�тване/преименуване на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "копиране на клон и принадлежащи� му журнал на указателите"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "копиране на клон, дори ако има вече клон � такова име"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "�ъздаване на журнала на указателите на клона"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "редактиране на опи�анието на клона"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "принудително �ъздаване, преме�тване, преименуване, изтриване"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "извеждане �амо на �летите клони"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "извеждане �амо на не�летите клони"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "КЛЮЧ"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "ОБЕКТ"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "ФОРМ�Т за изхода"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "Опциите „--column“ и „--verbose“ �а не�ъвме�тими"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "�еобходимо е име на клон"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "�е може да зададете опи�ание на не�вързан „HEAD“"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "�е може да редактирате опи�анието на повече от един клон едновременно"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ в�е още н�ма подавани�."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Лип�ва клон на име „%s“."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "Прекалено много клони за преименуване"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "прекалено много клони за копиране"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "Зададени �а прекалено много клони за �ледене"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "прекалено много аргументи към командата за преименуване"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "прекалено много аргументи към командата за �ледене"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5905,57 +6041,45 @@ msgstr ""
 "Следеното от „HEAD“ не може да �е зададе да е „%s“, защото то не �очи към "
 "никой клон."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "��ма клон на име „%s“."
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "�е �ъще�твува клон на име „%s“."
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "Прекалено много клони за махане на �ледене"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "прекалено много аргументи към командата за �пиране на �ледене"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не �очи към никой клон."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "��ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "��ма никакъв �ми�ъл ръчно да �ъздавате „HEAD“."
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "Опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"Опци�та „--set-upstream“ вече е о�тар�ла и пред�тои да бъде махната.  "
-"Използвайте „--track“ или „--set-upstream-to“\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"За да накарате „%s“ да �леди „%s“, изпълнете �ледната команда:\n"
-"\n"
+"Опци�та „--set-upstream“ вече не �е поддържа.  Използвайте „--track“ или „--"
+"set-upstream-to“"
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5970,7 +6094,7 @@ msgstr "За �ъздаването на пратка е необходимо х
 msgid "Need a repository to unbundle."
 msgstr "За приемането на пратка е необходимо хранилище."
 
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5978,7 +6102,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
 
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5986,71 +6110,71 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 "ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), "
 "„tag“ (етикет)"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "извеждане на вида на обект"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "извеждане на размера на обект"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "изход � 0, когато н�ма грешка"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "форматирано извеждане на �ъдържанието на обекта"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 "да �е �тартира програмата зададена в на�тройката „textconv“ за преобразуване "
 "на �ъдържанието на обекта BLOB"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "да �е �тартират програмите за преобразуване на �ъдържанието на обектите BLOB"
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "обект BLOB"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "опциите „--textconv“/„--filters“ изи�кват път"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "позвол�ване на опциите „-s“ и „-t“ да работ�т � повредени обекти"
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "буфериране на изхода от „--batch“"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "извеждане на информаци� и �ъдържание на обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 msgid "show info about objects fed from the standard input"
 msgstr "извеждане на информаци� за обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "�ледване на �имволните връзки �очещи в дървото (ползва �е � „--batch“ или „--"
 "batch-check“)"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "извеждане на в�ички обекти � „--batch“ или „--batch-check“"
 
@@ -6078,7 +6202,7 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -6168,9 +6292,9 @@ msgid "write the content to temporary files"
 msgstr "запи�ване на �ъдържанието във временни файлове"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "�ИЗ"
 
@@ -6242,54 +6366,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде обновен"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Занул�ване на клона „%s“\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече �те на „%s“\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6311,7 +6435,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6338,164 +6462,164 @@ msgstr[1] ""
 " git branch ИМЕ_��_�ОВИЯ_КЛО� %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на вер�иите"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който пред�тои да бъде �ъздаден"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "очакваше �е един указател, а �те подали %d."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опци�та „%s“ е не�ъвме�тима � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "задаване на кой клон бива �леден при �ъздаването на нови� клон"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "дей�твие при конфликт (�ливане или тройна разлика)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "извеждане на напредъка"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--orphan“ �а не�ъвме�тими една � друга"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Лип�ва име на клон, използвайте опци�та „-b“"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s“ не е подаване, затова от него не може да �е �ъздаде клон „%s“"
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опци�та „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6533,7 +6657,7 @@ msgstr "Хранилището „%s“ ще бъде пре�кочено\n"
 msgid "failed to remove %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6546,7 +6670,7 @@ msgstr ""
 "ПРЕФИКС    — избор на един�твен обект по този уникален префик�\n"
 "           — (празно) нищо да не �е избира\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6567,39 +6691,39 @@ msgstr ""
 "*          — избиране на в�ички обекти\n"
 "           — (празно) завършване на избирането\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "�еправилен избор (%s).\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �икой обект не напа�ва на „%s“"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
 #
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Изход.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6617,63 +6741,63 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "��� Команди ���"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Избор на �ледващо дей�твие"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следни�т обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчи�тване �вършиха.  Изход от програмата."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "Ш�БЛО�"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "добав�не на Ш�БЛО� от файлове, които да не �е три�т"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "изтриване �амо на игнорирани файлове"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6681,7 +6805,7 @@ msgstr ""
 "�а�тройката „clean.requireForce“ е зададена като и�тина, което изи�ква н�ко� "
 "от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши изчи�тване"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6690,146 +6814,146 @@ msgstr ""
 "което изи�ква н�ко� от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши "
 "изчи�тване"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ДИРЕКТОРИЯ]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "без �ъздаване на работно дърво"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "�ъздаване на голо хранилище"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 "�ъздаване на хранилище-огледало (включва опци�та „--bare“ за голо хранилище)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "клониране от локално хранилище"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "без твърди връзки, файловете винаги да �е копират"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "на�тройване за �поделено хранилище"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "път"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "инициализиране на подмодулите при това клониране"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "брой подмодули, клонирани паралелно"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "директори� � шаблони"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "опци�та „--reference“ може да �е използва �амо при клониране"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "ИМЕ"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "използване на това ИМЕ вме�то „origin“ при про�лед�ване на клони"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "изтегл�не на този КЛО�, а не �очени�т от отдалечени� указател „HEAD“"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "ВРЕМЕ"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "плитко клониране до момент във времето"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "вер�и�"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до изключващ указател"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
 "зададени� � „--branch“"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "без клониране на етикети, като по�ледващите до�тав�ни� н�ма да ги �лед�т"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "в�ички клонирани подмодули ще �а плитки"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "СЛУЖЕБ��_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБ��_ДИРЕКТОРИЯ за git извън работното дърво"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "КЛЮЧ=СТОЙ�ОСТ"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "�амо адре�и IPv4"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "�амо адре�и IPv6"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6837,43 +6961,43 @@ msgstr ""
 "Името на директори�та не може да бъде отгатнато.\n"
 "Задайте директори�та изрично на командни� ред"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: не може да �е добави алтернативен източник на „%s“: %s\n"
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ �ъще�твува и не е директори�"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде �ъздадена"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "дей�твието завърши.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6884,103 +7008,103 @@ msgstr ""
 "клон в момента �а изтеглени � командата „git status“.  Можете да\n"
 "завършите изтегл�нето на клона � командата „git checkout -f HEAD“.\n"
 
-#: builtin/clone.c:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
 "и който �ледва да бъде изтеглен, не �ъще�твува."
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "обектът „%s“ не може да бъде обновен"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указател�т „HEAD“ от отдалеченото хранилище �очи към нещо,\n"
 "което не �ъще�твува.  �е може да �е изтегли определен клон.\n"
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "на�тройките не могат да бъдат запи�ани в конфигурационни� файл"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "не може да �е извърши пакетиране за изчи�тване на файловете"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целеви�т път „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "родител�ките директории на „%s“ не могат да бъдат �ъздадени"
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде �ъздадено."
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и �ъздаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и �ъздаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6988,43 +7112,43 @@ msgstr ""
 "Опци�та „--recursive“ е не�ъвме�тима � опциите „--reference“ и „--reference-"
 "if-able“"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--depth“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-since“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-exclude“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�е �е поддържа клониране на връзки от вида „%s“ "
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Отдалечени�т клон „%s“ лип�ва в клонираното хранилище „%s“"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
@@ -7168,61 +7292,61 @@ msgstr ""
 "Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
 "о�таналите подавани�.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "временни�т индек� не може да бъде �ъздаден"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "неу�пешно интерактивно добав�не"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "временни�т индек� не може да бъде обновен"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "Дървото на о�новни� кеш не може да бъде обновено"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "нови�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на �ливане не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "временни�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната ча�т за автор в подаването „%s“ лип�ва"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната ча�т за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опци�та „--author“"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7230,38 +7354,38 @@ msgstr ""
 "не може да �е избере знак за коментар — в текущото �ъобщение за подаване �а "
 "използвани в�ички подобни знаци"
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�ледното подаване не може да бъде открито: %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на �ъобщението за подаване от �тандартни� вход)\n"
 
-#: builtin/commit.c:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "�ъобщението за подаване не бе прочетено �тандартни� вход"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът �ъ� �ъобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "�ъобщението за �мачкване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7276,7 +7400,7 @@ msgstr ""
 "  %s\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7292,7 +7416,7 @@ msgstr ""
 "  %s\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7301,7 +7425,7 @@ msgstr ""
 "Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
 "� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7312,153 +7436,153 @@ msgstr ""
 "� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.  Празно \n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:   %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте �ъобщението � н�ко� от опциите „-m“ или „-F“.\n"
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "Опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
 "никой автор"
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилна �тойно�т за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "Опциите „--long“ и „-z“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента �е извършва �ливане, не можете да поправ�те."
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента �е извършва отбиране на подаване, не можете да поправ�те."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Опци�та „-m“ е не�ъвме�тима � „-c“, „-C“, „-F“ и „--fixup“."
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
 "не�ъвме�тими."
 
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr "Опциите „--include“ и „--only“ изи�кват аргументи."
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "Опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "информаци� за �катаното"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "РЕЖИМ"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "извеждане на не�ледените файлове.  Възможните РЕЖИМи �а „all“ (подробна "
 "информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове).  "
 "Стандартни�т РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "КОГ�"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7467,205 +7591,206 @@ msgstr ""
 "една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
 "„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде открито"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде анализирано"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "не�вързан връх „HEAD“"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (начално подаване)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "�ВТОР"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "Д�Т�"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "СЪОБЩЕ�ИЕ"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "СЪОБЩЕ�ИЕ при подаване"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "ПОД�В��Е"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение при �мачкване за вкарване на указаното "
 "ПОД�В��Е в предното без �леда"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение при �мачкване за �мачкване на "
 "указаното ПОД�В��Е в предното"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "добав�не на поле за подпи� — „Signed-off-by:“"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "�тандартно"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "кои празни знаци и #коментари да �е махат от �ъобщени�та"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "подпи�ване на подаването � GPG"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при пром�на на �ъобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
+
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7837,12 +7962,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "„--local“ може да �е използва �амо в хранилище"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде �ъздаден"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7852,11 +7977,11 @@ msgstr ""
 "За да промените „%s“, ползвайте регул�рен израз или опциите „--add“ и „--"
 "replace-all“."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "извеждане на размерите на обектите във формат ле�но четим от хора"
 
@@ -7880,47 +8005,47 @@ msgstr "кратко"
 msgid "annotated"
 msgstr "анотирано"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "не �ъще�твува анотиран етикет „%s“"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "в анотирани� етикет „%s“ лип�ва вградено име"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "етикетът „%s“ тук е в�ъщно�т „%s“"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�еправилно име на обект „%s“"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "„%s“ е неправилен обект „%s“"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "никой етикет не напа�ва точно „%s“"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "тър�ене за опи�ание на „%s“\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "тър�енето приключи при „%s“\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7929,7 +8054,7 @@ msgstr ""
 "�икой анотиран етикет не опи�ва „%s“.\n"
 "Съще�твуват и неанотирани етикети.  Пробвайте � опци�та „--tags“."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7938,12 +8063,12 @@ msgstr ""
 "�икой етикет не опи�ва „%s“.\n"
 "Пробвайте � опци�та „--always“ или �ъздайте етикети."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "претър�ени �а %lu подавани�\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7952,78 +8077,78 @@ msgstr ""
 "открити �а над %i етикета, изведени �а по�ледните %i,\n"
 "тър�енето бе прекратено при „%s“.\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "откриване на етикета, който �ледва подаване"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr ""
 "извеждане на информаци� за тра�иране на �тратеги�та за тър�ене на "
 "�тандартната грешка"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "използване на произволен указател"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "използване на в�еки етикет — включително и неанотираните"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "винаги да �е ползва дълги�т формат"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "про�лед�ване �амо на първи� родител"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "извеждане �амо на точните �ъвпадени�"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "да �е тър�и �амо в този БРОЙ по�ледни етикети (�тандартно: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "да �е тър�и �амо измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "да не �е тър�и измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на �ъкратено име на обект като резервен вариант"
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "М�РКЕР"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добав�не на такъв М�РКЕР на работното дърво (�тандартно е „-dirty“)"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "добав�не на такъв М�РКЕР на �чупеното работно дърво (�тандартно е „-broken“)"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Опциите „--long“ и „--abbrev=0“ �а не�ъвме�тими"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "�е �а открити имена — нищо не може да бъде опи�ано."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "опци�та „--dirty“ е не�ъвме�тима � указател към подаване"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "опци�та „--broken“ е не�ъвме�тима � указател към подаване"
 
@@ -8037,21 +8162,21 @@ msgstr "„%s“: не е нито обикновен файл, нито Ñ�имÐ
 msgid "invalid option: %s"
 msgstr "неправилна опци�: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "�е е хранилище на Git"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "зададен е неправилен обект „%s“."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "зададени �а повече от 2 обекта BLOB: „%s“"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "зададен е неподдържан обект „%s“."
@@ -8060,27 +8185,27 @@ msgstr "зададен е неподдържан обект „%s“."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ОПЦИЯ…] [ПОД�В��Е [ПОД�В��Е]] [[--] ПЪТ…]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "неу�пешно дей�твие � изходен код: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "файлът, �очен от �имволната връзка „%s“, не може да бъде прочетен"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "обектът „%s“ за �имволната връзка „%s“ не може да бъде прочетен"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -8088,55 +8213,55 @@ msgstr ""
 "комбинираните формати на разликите („-c“ и „--cc“) не �е поддържат\n"
 "в режима за разлики върху директории („-d“ и „--dir-diff“)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "и двата файла �а променени: „%s“ и „%s“."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "работното дърво е изо�тавено."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "в „%s“ има временни файлове."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "възможно е да ги изчи�тите или въз�тановите"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "използвайте „diff.guitool“ вме�то „diff.tool“"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "разлика по директории"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "�тартиране на ПРОГР�М�та за разлики без предупреждение"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "�ледване на �имволните връзки при разлика по директории"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "ПРОГР�М�"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "използване на указаната ПРОГР�М�"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "извеждане на �пи�ък � в�ички ПРОГР�Ми, които може да �е ползват � опци�та „--"
 "tool“"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -8144,19 +8269,19 @@ msgstr ""
 "„git-difftool“ да �пре работа, когато �тартираната ПРОГР�М� завърши � "
 "ненулев код"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "КОМ��Д�"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "команда за разглеждане на разлики"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не е зададена програма за „--tool=ПРОГР�М�“"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не е зададена команда за „--extcmd=КОМ��Д�“"
 
@@ -8164,143 +8289,143 @@ msgstr "не е зададена команда за „--extcmd=КОМÐ�Ð�ДÐ�â
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [ОПЦИИ_З�_СПИСЪК�_С_ВЕРСИИ]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "Съобщение за напредъка на в�еки такъв БРОЙ обекта"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "Как да �е обработват подпи�аните етикети"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "Как да �е обработват етикетите на филтрираните обекти"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Запазване на маркерите в този Ф�ЙЛ"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "Вна��не на маркерите от този Ф�ЙЛ"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "Да �е използва изку�твено име на човек при лип�а на задаващ етикета"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Извеждане на ц�лото дърво за в��ко подаване"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "Използване на маркер за завършване на потока"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Без извеждане на �ъдържанието на обектите BLOB"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "УК�З�ТЕЛ_��_ВЕРСИЯ"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информаци�"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ОПЦИЯ…] ГРУП�"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ОПЦИЯ…] [(ХР��ИЛИЩЕ | ГРУП�)…]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добав�не към „.git/FETCH_HEAD“ вме�то зам�на"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да �е качи пакетът"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "принудително презапи�ване на локални� клон"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "до�тав�не от множе�тво отдалечени хранилища"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "до�тав�не на в�ички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без до�тав�нето на в�ички етикети „--no-tags“"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "брой подмодули до�тавени паралелно"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ока�тр�не на клоните �лед�щи вече не�ъще�твуващи отдалечени клони"
 
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "ПРИ �УЖД�"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети � обекти"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "позвол�ване на обнов�ването на указател� „HEAD“"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на и�тори�та на плитко хранилище"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до определено време"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "директори�"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "добав�не на това пред път� на подмодула"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8308,91 +8433,91 @@ msgstr ""
 "�тандартно рекур�ивно изтегл�не на подмодулите (файловете � на�тройки �а � "
 "приоритет)"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обнов�ват „.git/shallow“"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "Указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "на�тройката „fetch.output“ е � неправилна �тойно�т „%s“"
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[актуализиран]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "в текущи� клон не може да �е до�тав�"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "�ъщин�ко �ливане"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "отхвърл�не на върха „%s“, защото плитките хранилища не могат да бъдат "
 "обнов�вани"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8402,55 +8527,55 @@ msgstr ""
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "�е може да до�тавите в текущи� клон „%s“ на хранилище, което не е голо"
 
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Стойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Опци�та „%s“ �е пре�кача при „%s“\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "�е �е поддържа до�тав�не от „%s“"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "„%s“ не може да �е до�тави"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8458,41 +8583,41 @@ msgstr ""
 "�е �те указали отдалечено хранилище.  Задайте или адре�, или име\n"
 "на отдалечено хранилище, откъдето да �е до�тав�т новите вер�ии."
 
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Тр�бва да укажете име на етикет."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "Опциите „--deepen“ и „--depth“ �а не�ъвме�тими една � друга"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не можете да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 "към „git fetch --all“ не можете да добавите аргумент — указател на вер�и�"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "��ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Указването на група и указването на вер�и� �а не�ъвме�тими"
 
@@ -8502,25 +8627,25 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m СЪОБЩЕ�ИЕ] [--log[=БРОЙ] | --no-log] [--file Ф�ЙЛ]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 "вмъкване на журнал �ъ�то�щ �е от не повече от БРОЙ запи�а от �ъкратени� "
 "журнал"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "�иноним на „--log“ (о�тар�ло)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "за начало на �ъобщението да �е ползва ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "файл, от който да �е чете"
 
@@ -8560,102 +8685,106 @@ msgstr "цитиране подход�що за tcl"
 msgid "show only <n> matched refs"
 msgstr "извеждане �амо на този БРОЙ напа�нати указатели"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "�пазване на цветовете на форма̀та"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "извеждане �амо на указателите, �очещи към ОБЕКТ�"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "извеждане �амо на �летите указатели"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "извеждане �амо на не�летите указатели"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "извеждане �амо на указателите, които �ъдържат това ПОД�В��Е"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "извеждане �амо на указателите, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
 # FIXME bad message
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване на указателите от журнала като глави (�тандартно)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на до�тижимите обекти"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [ОПЦИЯ…]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "�еу�пешно изпълнение на „fstat“ върху „%s“: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "�еу�пешно изпълнение на „stat“ върху „%s“"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8672,49 +8801,49 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "ока�тр�не на обектите, към които нищо не �очи"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "изчерпателно тър�ене на боклука (за �метка на повече време работа)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "включване на автоматичното �ъбиране на боклука (auto-gc)"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "изрично �тартиране на �ъбирането на боклука, дори и ако вече работи друго "
 "�ъбиране"
 
-#: builtin/gc.c:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "�еразпозната �тойно�т на „gc.logexpiry“: %s"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "�втоматично пакетиране на заден фон на хранилището за по-добра "
 "производително�т.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматично пакетиране на хранилището за по-добра производително�т.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "Погледнете ръковод�твото за повече информаци� как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8723,7 +8852,7 @@ msgstr ""
 "проце�а: %<PRIuMAX> (ако �те �игурни, че това не е в�рно, това използвайте\n"
 "опци�та „--force“)"
 
-#: builtin/gc.c:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8734,12 +8863,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] Ш�БЛО� [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неу�пешно �ъздаване на нишка: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -8748,263 +8877,255 @@ msgstr "зададен е неправилен брой нишки (%d) за %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "лип�ва поддръжка за нишки.  „%s“ ще �е пренебрегне"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да �е изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опци�та „%c“ очаква чи�ло за аргумент"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "тър�ене в индек�а, а не в работното дърво"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "тър�ене и във файловете, които не �а под управлението на git"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "тър�ене и в �ледените, и в не�ледените файлове"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "рекур�ивно тър�ене във в�ички подмодули"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "ОС�ОВ�О ИМЕ"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "добав�не на ОС�ОВ�Ото ИМЕ на проекта към изхода"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не �ъвпадат"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "без значение на реги�търа на буквите (главни/малки)"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "напа�ване на шаблоните �амо по границите на думите"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като тек�тови"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "пре�качане на двоичните файлове"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към тек�т"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "навлизане мак�имално на тази ДЪЛБОЧИ�� в дървото"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регул�рни изрази по POSIX"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "о�новни регул�рни изрази по POSIX (�тандартно)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните �а до�ловни низове"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "регул�рни изрази на Perl"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на отно�ителните имена на файловете �пр�мо о�новната директори� на "
 "хранилището"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане �амо на имената на файловете без напа�ващите редове"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "�иноним на „--files-with-matches“"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане �амо на имената на файловете, които не �ъдържат ред, напа�ващ на "
 "шаблона"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "извеждане на нулеви� знак „NUL“ �лед в��ко име на файл"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на бро� на �ъвпадени�та вме�то напа�ващите редове"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "оцвет�ване на напа�вани�та"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напа�вани�та от различни файлове"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла �амо веднъж за в�ички напа�вани� от този файл"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и �лед напа�вани�та"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напа�вани�та"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове �лед напа�вани�та"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "използване на такъв БРОЙ работещи нишки"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "�иноним на „-C БРОЙ“"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред � името на функци�та, в ко�то е напа�нат шаблона"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функци�"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "изчитане на шаблоните от Ф�ЙЛ"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "напа�ване на Ш�БЛО�"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани � опци�та „-e“"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на �тандартни� изход.  Изходни�т код указва наличието на "
 "напа�ване"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове �амо от файловете, които напа�ват на в�ички шаблони"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "извеждане на дървото за анализ на регул�рни� израз"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "програма за преглед по �траници"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "извеждане на �ъвпадащите файлове в програма за преглед по �траници"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позвол�ване на �тартирането на grep(1) (текущи�т компилат пренебрегва тази "
 "опци�)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "лип�ва шаблон."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � вер�ии."
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "вер�и�та „%s“ не може бъде открита"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "зададен е неправилен брой нишки: %d"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "лип�ва поддръжка за нишки.  „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "опци�та „--open-files-in-pager“ е �ъвме�тима �амо � тър�ене в работното дърво"
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "опци�та е не�ъвме�тима � „--recurse-submodules“."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � „--no-index“."
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "опциите „--(no-)exclude-standard“ �а не�ъвме�тими � тър�ене по �ледени "
 "файлове."
 
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "опци�та „--cached“ е не�ъвме�тима �ъ� задаване на дърво."
 
@@ -9097,12 +9218,12 @@ msgstr "Вер�и�та на „emacsclient“ не може да �е анал
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Прекалено �тара вер�и� на „emacsclient“ — %d (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -9111,7 +9232,7 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -9120,366 +9241,366 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръковод�твото."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "нико� програма за преглед на ръковод�тво не у�п� да обработи за�вката"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr ""
 "нико� програма за преглед на информационните �траници не у�п� да обработи "
 "за�вката"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "Указване на атрибути към път"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Ежедневието в Git в рамките на 20-ина команди"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Речник � термините на Git"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указване на не�ледени файлове, които да бъдат нарочно пренебрегвани"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "Дефиниране на �вой�твата на подмодулите"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указване на вер�ии и диапазони в Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Въвеждащ урок за Git (вер�ии поне 1.5.1)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Общ преглед на препоръчваните начини за работа � Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "Попул�рните пътеводители в Git �а:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "„git %s“ е �иноним на „%s“"
+msgid "'%s' is aliased to '%s'"
+msgstr "„%s“ е �иноним на „%s“"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "обектът „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "неправилен вид на обекта „%s“"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "очаквани�т обект „%s“ не бе получен"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "неправилен вид на обекта „%s“: очакваше �е „%s“, а бе получен „%s“"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "не може да �е запълни %d байт"
 msgstr[1] "не може да �е запълн�т %d байта"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "неочакван край на файл"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "грешка при четене на входните данни"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "използвани �а повече от наличните байтове"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 msgid "pack too large for current definition of off_t"
 msgstr "пакетни�т файл е прекалено гол�м за текущата �тойно�т на типа „off_t“"
 
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "пакетни�т файл надвишава мак�имални� възможен размер"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде �ъздаден"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "не�ъответ�твие в подпи�а към пакетни� файл"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "не �е поддържа пакетиране вeр�и� „%<PRIu32>“"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "повреден обект в пакетни� файл при отме�тване %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "декомпре�ирането � „inflate“ върна %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "�тойно�тта на отме�тването за обекта-разлика води до препълване"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "�тойно�тта на отме�тването за обекта-разлика е извън диапазона"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "непознат вид обект %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "пакетни�т файл не може да бъде прочетен"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "�ериозна грешка при декомпре�иране � „inflate“"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 "СЪВП�ДЕ�ИЕ �� СТОЙ�ОСТИТЕ З� СУМИТЕ З� SHA1: „%s“ �� ДВ� Р�ЗЛИЧ�И ОБЕКТ�!"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "обектът „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�ъще�твуващи�т обект в „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�ъще�твуващи�т обект „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправилен обект BLOB „%s“"
 
 # FIXME perhaps invalid object
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен обект „%s“"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Грешка в обекта"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "��кои обекти, на�ледници на „%s“, не могат да бъдат до�тигнати"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "разликата не може да бъде приложена"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "Получаване на обекти"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Индек�иране на обекти"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакетни�т файл е повреден (нееднакви �уми по SHA1)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "не може да �е получи информаци� за пакетни� файл � „fstat“"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "в кра� на пакетни� файл има повредени данни"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 "фатална грешка във функци�та „parse_pack_objects“.  Това е грешка в Git, "
 "докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
 "kernel.org“."
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "Откриване на �ъответните разлики"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не може да �е �ъздаде нишка: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr ""
 "фатална грешка във функци�та „conclude_pack“.  Това е грешка в Git, "
 "докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
 "kernel.org“."
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "дей�твието завърши � %d локален обект"
 msgstr[1] "дей�твието завърши � %d локални обекта"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "�еочаквана по�ледваща �ума за грешки за „%s“ (причината може да е грешка в "
 "ди�ка)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "в пакета има %d ненапа�ваща разлика"
 msgstr[1] "в пакета има %d ненапа�ващи разлики"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "добавени�т обект не може да �е компре�ира � „deflate“: %d"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локални�т обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "грешка при затвар�нето на пакетни� файл"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr ""
 "грешка при запи�ването на файла „%s“, о�игур�ващ запазване на директори�"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 "грешка при затвар�нето на запи�ани� файл „%s“, о�игур�ващ запазване на "
 "директори�"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "пакетни�т файл не може да бъде запазен"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "зададена е неправилна вер�и� пакетиране: „pack.indexversion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съще�твуващи�т пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съще�твуващи�т индек� за пакетни� файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d обект не е разлика"
 msgstr[1] "%d обекта не �а разлика"
 
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: builtin/index-pack.c:1623
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "неправилна �тойно�т „%s“"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изи�ква хранилище на git"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
 
@@ -9614,136 +9735,168 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "ЛЕКСЕМ�[(=|:)СТОЙ�ОСТ])…] [Ф�ЙЛ…]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "директно редактиране на файловете"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "изчи�тване на празните епилози"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "къде да �е по�тави нови�т епилог"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "дей�твие, ако епилог вече �ъще�твува"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "дей�тви при лип�ващ епилог"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "извеждане �амо на епилозите"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "без прилагане на правилата за на�тройките"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "�ливане на �тойно�тите по�ледване от знаци за интервали"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "опции при анализ"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "епилог"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "епилог(зи) за добав�не"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "опци�та „--trailer“ е не�ъвме�тима � „--name-only“"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "не е зададен входен файл за редактиране на м��то"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] ПЪТ…]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправилна опци� „--decorate“: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "извеждане на изходни� код"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr ""
 "Използване на файл за �ъответ�тви�та на имената и адре�ите на е-поща („."
 "mailmap“)"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "на�тройки на форма̀та на извежданата информаци�"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Обработване �амо на редовете във файла в диапазона от n до m включително.  "
 "Броенето започва от 1"
 
-#: builtin/log.c:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "Обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "�еизве�тен вид: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "прекалено дълго име на директори�та за изходната информаци�"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Тр�бва да зададете точно един диапазон."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "�е е диапазон."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "Придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Можете да укажете мак�имум една директори� за изход."
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "�епознато подаване „%s“"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е може да �е открие към какво �очи „%s“."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "Точната база за �ливане не може да �е открие."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9753,226 +9906,234 @@ msgstr ""
 "зададете, използвайте „git branch --set-upstream-to“.\n"
 "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "Точната база при �ливане не може да бъде открита"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Използване на „[RFC PATCH]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) хешът да е �амо от нули"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "да не �е включват кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ.  �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за �ъобщени�та.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "Б�ЗОВО_ПОД�В��Е"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "добав�не на необходимото Б�Зово дърво към �ери�та кръпки"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "извеждане на напредъка във фазата на �ъздаване на кръпките"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ �а не�ъвме�тими."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr ""
 "изходът може да или �тандартни�т, или да е в директори�, но не и двете."
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Създаване на кръпки"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "Изходните файлове не могат да бъдат �ъздадени"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9980,105 +10141,105 @@ msgstr ""
 "Следени�т отдалечен клон не бе открит, затова изрично задайте "
 "ОТД�ЛЕЧЕ�_КЛО�.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [Ф�ЙЛ…]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "извеждане на �ъ�то�нието на файловете � еднобуквени флагове"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да �е �четат за непроменени"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (�тандартно)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за �ъдържанието на индек�а"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които тр�бва да бъдат изтрити"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "извеждане �амо на името на другите (не�ледените) директории"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "извеждане на знаците за край на ред във файловете"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "извеждане на не�летите файлове"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "извеждане на информаци�та за отм�на на разрешените подавани�"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "пре�качане на файловете напа�ващи Ш�БЛО�а"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "шаблоните за игнориране да �е прочетат от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директори� от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "добав�не на �тандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да �а отно�ителни �пр�мо о�новната директори� на проекта"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако н�кой от тези Ф�ЙЛове не е в индек�а"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "УК�З�ТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "�читане, че пътищата изтрити �лед УК�З�ТЕЛ�_КЪМ_ДЪРВО в�е още �ъще�твуват"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "извеждане на информаци�та за изчи�тване на грешки"
 
@@ -10171,181 +10332,186 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "празна пощен�ка кути� mbox: „%s“"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(�иноним на „--stat“)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на превъртане (�тандартно дей�твие)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "СТР�ТЕГИЯ"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при �ъщин�ки �ливани�)"
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "преу�танов�ване на текущото �ливане"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото �ливане"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "позвол�ване на �ливане на незави�ими и�тории"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr ""
+"проверка на куката при пром�на на �ъобщението при подаване (commit-msg)"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (н�ма какво да �е �мачка)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Подаване �ъ� �мачкване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Лип�ва �ъобщение при подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не �очи към подаване"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�епозната опци� за рекур�ивното �ливане „merge-recursive“: „-X%s“"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането н�ма да бъде подадено.  За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10360,72 +10526,72 @@ msgstr ""
 "Редовете, които започват � „%c“ ще бъдат пропу�нати, а празно �ъобщение\n"
 "преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на �ливането завърши.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "�еу�пешно автоматично �ливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "�еправилна �тойно�т „%s“ в �редата „%s“"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да �е �лее в „%s“: %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "не може да �е �лее"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "опци�та „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "опци�та „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не �е извършва �ливане (лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10433,7 +10599,7 @@ msgstr ""
 "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10441,121 +10607,121 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува).  Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Опци�та „--squash“ е не�ъвме�тима � „--no-ff“."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "Подаване �ъ� �мачкване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без и�тори�, в�ички �ливани� �а превъртани�, не може да �е "
 "извърши �ъщин�ко �ливане изи�квано от опци�та „--no-ff“"
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можете да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Подаването „%s“ е без подпи� от GPG."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "незави�ими и�тории не може да �е �ле�т"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Вече е обновено."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба �ъ� �ливане в рамките на индек�а…\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Вече е обновено!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "�е може да �е извърши превъртане, преу�танов�ване на дей�твието."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10699,7 +10865,7 @@ msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Директори�та „%s“ е в индек�а, но не е подмодул"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "За да продължите, или вкарайте промените по файла „.gitmodules“ в индек�а,\n"
@@ -10718,68 +10884,68 @@ msgstr "принудително преме�тване/преименуване
 msgid "skip move/rename errors"
 msgstr "пре�качане на грешките при преме�тване/преименуване"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ �ъще�твува и не е директори�"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "директори� не може да �е преме�ти в �ебе �и"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "директори� не може да �е преме�ти върху файл"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "първоначалната директори� е празна"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "целта �ъще�твува"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презапи�ване на „%s“"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "Презапи�ването е невъзможно"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "множе�тво източници за една цел"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "целевата директори� не �ъще�твува"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неу�пешно преименуване на „%s“"
@@ -10973,19 +11139,19 @@ msgstr "обектът-бележка не може да бъде запи�ан
 msgid "the note contents have been left in %s"
 msgstr "�ъдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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“."
@@ -11014,49 +11180,49 @@ msgstr "бележката не може да �е копира от „%s“ к
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 "н�ма да �е извърши „%s“ върху бележките в „%s“, защото �а извън „refs/"
 "notes/“."
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "прекалено много параметри"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "н�ма бележки за обекта „%s“."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "низ, който е �ъдържанието на бележката"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "Ф�ЙЛ �ъ� �ъдържанието на бележката"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "преизползване и редактиране на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "преизползване на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "приемане и на празни бележки"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "зам�на на �ъще�твуващите бележки"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11065,31 +11231,31 @@ msgstr ""
 "�е може да �е добави бележка, защото такава вече �ъще�твува за обекта „%s“.  "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Презапи�ване на �ъще�твуващите бележки за обекта „%s“\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Изтриване на бележката за обекта „%s“\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "изчитане на обектите от �тандартни� вход"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "зареждане на на�тройките за КОМ��Д�та, ко�то презапи�ва подавани� (включва "
 "опци�та „--stdin“)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "прекалено малко параметри"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11098,12 +11264,12 @@ msgstr ""
 "�е може да �е копира бележка, защото такава вече �ъще�твува за обекта „%s“.  "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "н�ма бележки за обекта-източник „%s“.  �е може да �е копира."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11114,52 +11280,52 @@ msgstr ""
 "Вме�то това ги използвайте � подкомандата „add“: „git notes add -f -m/-F/-c/-"
 "C“.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "указател�т „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "указател�т „NOTES_MERGE_REF“ не може да бъде изтрит"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "работната директори� на „git notes merge“ не може да бъде изтрита"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "указател�т „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да �е открие."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да �е анализира."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не може да �е открие към какво �очи „NOTES_MERGE_REF“"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "неу�пешно �ливане на бележките"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "непозната �тратеги� за �ливане на бележки „%s“"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Общи опции"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Опции при �ливане"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -11169,46 +11335,46 @@ msgstr ""
 "„union“ (обедин�ване), „cat_sort_uniq“ (обедин�ване, подреждане, уникални "
 "резултати)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "Подаване на не�лети бележки"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завършване на �ливането чрез подаване на не�лети бележки"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Преу�танов�ване на корекци�та при �ливането на бележки"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "преу�танов�ване на �ливането на бележки"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ �а не�ъвме�тими"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "тр�бва да укажете указател към бележка за �ливане."
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизве�тна �тратеги� към опци�та „-s“/„--strategy“: „%s“"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "в момента �е извършва �ливане на бележките в „%s“ при „%s“"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не може да �е запази връзка към указател� на текущата бележка („%s“)."
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11219,239 +11385,239 @@ msgstr ""
 "резултата � „git notes merge --commit“ или преу�тановете �ливането � "
 "командата „git notes merge --abort“.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "��ма бележки за обекта „%s“\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "опитът за изтриването на не�ъще�твуваща бележка не �е �чита за грешка"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "докладване на ока�трените обекти"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "да �е използва бележката �очена от този УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "непозната подкоманда: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УК�З�ТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [ОПЦИЯ…] ПРЕФИКС_��_ИМЕТО [< СПИСЪК_С_УК�З�ТЕЛИ | < "
 "СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "грешка при декомпре�иране � „deflate“ (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, пакетите �а разделени поради "
 "�тойно�тта на „pack.packSizeLimit“"
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "Запи�ване на обектите"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, защото н�кои обекти н�ма да �е "
 "пакетират"
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "Компре�иране на обектите"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "без извеждане на напредъка"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "извеждане на напредъка"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "извеждане на напредъка във фазата на запазване на обектите"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 "�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВ��Е]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индек�а на пакетните файлове във форма̀та � указаната вер�и�"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "мак�имален размер на в�еки пакетен файл"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет о�вен по брой обекти"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "мак�имална дължина на веригата от разлики, ко�то е позволена в пакетни� файл"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "преизползване на �ъще�твуващите разлики"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "преизползване на �ъще�твуващите обекти"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "�тартиране на нишки за претър�ване на най-добрите �ъвпадени� на разликите"
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "без �ъздаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "изчитане на вер�иите от �тандартни� вход"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до в�е още непакетираните обекти"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr ""
 "включване на в�ички обекти, които могат да �е до�тигнат от произволен "
 "указател"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите �очени от запи�ите в журнала на указателите"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите �очени от индек�а"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на �тандартни� изход"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които �очат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "запазване на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "пакетиране и на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недо�тижимите обекти, които �а по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "�ъздаване на �ъкратени пакети"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подход�що за плитко до�тав�не"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които �а придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "ниво на компре�иране при пакетиране"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на в�ички родители — дори и тези, които нормално �а �крити при "
 "при�аждани�та"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на �ъще�твуващи индек�и на база битови ма�ки за у�кор�ване на "
 "пребро�ването на обектите"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 "запазване и на индек� на база побитова ма�ка, заедно � индек�а за пакета"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "Пребро�ване на обектите"
 
@@ -11467,11 +11633,11 @@ msgstr "пакетиране на в�ичко"
 msgid "prune loose refs (default)"
 msgstr "ока�тр�не на недо�тижимите указатели (�тандартно)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "Изтриване на повтар�щите �е обекти"
 
@@ -11512,7 +11678,7 @@ msgstr "Опции при �ливане"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "вна��не на промените чрез пребазиране, а не чрез �ливане"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "позвол�ване на превъртани�"
 
@@ -11533,7 +11699,7 @@ msgstr "брой подмодули издърпани паралелно"
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправилна �тойно�т за „pull.ff“: „%s“"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11541,14 +11707,14 @@ msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, върху "
 "който да пребазирате."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, който "
 "да �леете."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11556,7 +11722,7 @@ msgstr ""
 "�ай веро�тно �те подали шаблон за указатели, който не е напа�нал � нищо в "
 "отдалеченото хранилище."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11567,44 +11733,44 @@ msgstr ""
 "Понеже това не е хранилището по подразбиране на текущи� клон, тр�бва\n"
 "да укажете отдалечени� клон на командни� ред."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Извън в�ички клони."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Укажете върху кой клон и�кате да пребазирате."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Укажете кой клон и�кате да �леете."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "За повече информаци� погледнете ръковод�твото „git-pull(1)“"
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "КЛО�"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 ""
 "�ко и�кате да зададете информаци� за �леден клон, можете да направите това � "
 "командата:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11613,27 +11779,27 @@ msgstr ""
 "За �ливане е указан отдалечени�т указател „%s“,\n"
 "но такъв не е до�тавен."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "опци�та „--[no-]autostash“ изи�ква „--rebase“"
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "издърпване � пребазиране"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "тр�бва да подадете или �катаете промените."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11643,7 +11809,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон.  Работното\n"
 "ви копие бе превърт�но от подаване „%s“."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11660,15 +11826,15 @@ msgstr ""
 "  $ git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "пребазирането е невъзможно заради локално запи�аните промени по подмодулите"
@@ -12064,19 +12230,49 @@ msgstr "изчи�тване на грешки в командата „unpack-t
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [ОПЦИЯ…]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "запазване на празните подавани�"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "продължаване на пребазирането"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "преу�танов�ване на пребазирането"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "�ъздаване на �крипт за пребазиране"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "�ъкратени �уми по SHA1 в �пи�ъка за изпълнение"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "пълни �уми по SHA1 в �пи�ъка за изпълнение"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "проверка на �пи�ъка за изпълнение"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "пре�качане на излишните команди за отбиране"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr ""
+"преподреждане на редовете за �ливане на подавани�та �ъ� и без �мени на "
+"�ъобщението"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -12109,7 +12305,7 @@ msgstr ""
 "За да заглушите това �ъобщение, като запазите �тандартното поведение,\n"
 "задайте на�тройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -12130,11 +12326,11 @@ msgstr ""
 "За да заглушите това �ъобщение, задайте на�тройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Тр�бва да укажете директори�."
 
@@ -12289,12 +12485,12 @@ msgstr ""
 "указването на �ледени клони е �ми�лено �амо за отдалечени хранилища, от "
 "които �е до�тав�"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "вече �ъще�твува отдалечено хранилище � име „%s“."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "„%s“ е неправилно име за отдалечено хранилище"
@@ -12317,17 +12513,17 @@ msgstr "(�ъвпадащи)"
 msgid "(delete)"
 msgstr "(за изтриване)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Такова отдалечено хранилище н�ма: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде преименуван на „%s“"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12338,17 +12534,17 @@ msgstr ""
 "    %s\n"
 "  Променете на�тройките ръчно, ако е необходимо."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "неу�пешно �ъздаване на „%s“"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12362,116 +12558,116 @@ msgstr[1] ""
 "Бележка: ��колко клона извън йерархи�та „refs/remotes/“ не б�ха изтрити.\n"
 "Изтрийте ги чрез командата:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде изтрит"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нов (�ледващото до�тав�не ще го разположи в „remotes/%s“)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " �леден"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " �тар (изтрийте чрез „git remote prune“)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " не��но �ъ�то�ние"
 
 # CHECK
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "неправилен клон за �ливане „%s“.  �евъзможно е да пребазирате върху повече "
 "от 1 клон"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "интерактивно пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " �ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "�ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и � отдалечени� клон „%s“\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "�ъздаден"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "изтрит"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "актуален"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "може да �е превърти"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "локални�т е изо�танал"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s принудително изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s принудително изтла�ква към %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s изтла�ква към %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "без за�вки към отдалечените хранилища"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "� отдалечено хранилище „%s“"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  �дре� за до�тав�не: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(без адре�)"
 
@@ -12479,25 +12675,25 @@ msgstr "(без адре�)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  �дре� за изтла�кване: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  клон �очен от HEAD: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(без проверка)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(непознат)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12506,161 +12702,161 @@ msgstr ""
 "хранилище\n"
 "  не е еднозначен и е н�кой от �ледните):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Отдалечен клон:%s"
 msgstr[1] "  Отдалечени клони:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (�ъ�то�нието не бе проверено)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локален клон на�троен за издърпване чрез „git pull“:"
 msgstr[1] "  Локални клони на�троени за издърпване чрез „git pull“:"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Локалните указатели ще бъдат прене�ени чрез „ push“"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Локални�т указател, на�троен за „git push“%s:"
 msgstr[1] "  Локалните указатели, на�троени за „git push“%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "задаване на refs/remotes/ИМЕ/HEAD �поред отдалеченото хранилище"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "�е може да �е у�танови отдалечени�т връх"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Множе�тво клони � върхове.  Изберете изрично н�кой от т�х чрез командата:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�еправилен указател: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "„%s“ не може да �е на�трои"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr "„%s“ ще �е превърне в обект извън клоните!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr "„%s“ �е превърна в обект извън клоните!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "Ока�тр�не на „%s“"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "адре�: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " � [ще бъде ока�трено] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " � [ока�трено] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "ока�тр�не на огледалата на отдалечените хранилища �лед до�тав�не"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "добав�не на клон"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "не е указано отдалечено хранилище"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "запитване към адре�ите за изтла�кване, а не за до�тав�не"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "извеждане на в�ички адре�и"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "не е зададен адре� за отдалеченото хранилище „%s“"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "пром�на на адре�ите за изтла�кване"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "добав�не на адре�и"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "изтриване на адре�и"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "опциите „--add“ и „--delete“ �а не�ъвме�тими"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправилен (�тар) формат за адре�: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Такъв адре� не е открит: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "�икой от адре�ите, които не �а за изтла�кване, н�ма да �е изтрие"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "повече подробно�ти.  По�тав� �е пред подкоманда"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "�епозната подкоманда: %s"
@@ -12767,7 +12963,7 @@ msgstr "пакетите в хранилище Ñ� важни обекти не Ð
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "Опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "директори�та „%s“ не може да бъде изтрита"
@@ -12900,123 +13096,123 @@ msgstr "�л�то (merge)"
 msgid "keep"
 msgstr "запазващо (keep)"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "Указател�т „HEAD“ е повреден."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "Дървото, �очено от указател� „HEAD“, не може да бъде открито."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Дървото, �очено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указател�т „HEAD“ �очи към „%s“"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�е може да �е извърши %s занул�ване по време на �ливане."
 
-#: builtin/reset.c:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "по-малко подробно�ти, да �е извеждат �амо грешките"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "индек�а и указател� „HEAD“, без работното дърво"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "�амо указател� „HEAD“, без индек�а и работното дърво"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "указател� „HEAD“, индек�а и работното дърво"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "занул�ване на указател� „HEAD“, но запазване на локалните промени"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбел�зване �амо на факта, че изтритите пътища ще бъдат добавени по-къ�но"
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойно�тта „%s“ не е разпозната като �ъще�твуваща вер�и�."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 "опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard/--mixed/--soft“"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опци�та „--mixed“ не бива да �е използва заедно � пътища.  Вме�то това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�е може да извършите %s занул�ване, когато �те задали ПЪТ."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s занул�ване"
 
-#: builtin/reset.c:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "Опци�та „-N“ е �ъвме�тима �амо � „--mixed“"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Промени извън индек�а �лед занул�ването:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индек�ът не може да бъде занулен към вер�и� „%s“."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [�РГУМЕ�Т…]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "зададени�т низ „--“ да �е тълкува като аргумент"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "�пиране на анализа �лед първи� аргумент, който не е опци�"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "изход в дълги� формат"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13108,11 +13304,11 @@ msgstr "позволÑ�ване на празни Ñ�ъобщениÑ� при поÐ
 msgid "keep redundant, empty commits"
 msgstr "запазване на излишните, празни подавани�"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "неу�пешна отм�на"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "неу�пешно отбиране"
 
@@ -13187,17 +13383,17 @@ msgstr ""
 "изходни�т код да е 0, дори ако никой файл нe e напа�нал � шаблона за "
 "изтриване"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "без използването на опци�та „-r“ „%s“ н�ма да �е изтрие рекур�ивно"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: „%s“ не може да �е изтрие"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "„%s“ не може да бъде изтрит"
@@ -13233,27 +13429,27 @@ msgstr "извеждане на �ъ�то�нието от отдалечена
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "Групиране по подаващ, а не по автор"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "подредба на подавани�та по бро� подавани� от автор"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Без опи�ани� на подавани�та — да �е показва �амо бро� подавани�"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Извеждане на адре�а на е-поща за в�еки автор"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "ШИРОЧИ��[,ОТСТЪП_1[,ОТСТЪП_2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr ""
 "Прена��не на редовете до тази обща ШИРОЧИ�� (76), � ОТСТЪП_1 (6) за първи� "
@@ -13461,35 +13657,35 @@ msgstr "пропу�кане на в�ички редове, които запо
 msgid "prepend comment character and space to each line"
 msgstr "добав�не на „# “ в началото на в�еки ред"
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател н�ма: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква �е пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не може да �е махне компонент от адре�а „%s“"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Във файла „.gitmodules“ не е открит адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13498,81 +13694,81 @@ msgstr ""
 "на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
 "за �ебе �и."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Реги�триран е подмодул „%s“ (%s) за път� към подмодул „%s“\n"
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: препоръчва �е режим на обнов�ване за подмодула „%s“\n"
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "Без извеждане на информаци� при инициализирането на подмодул"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper name [ПЪТ]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Във файла „.gitmodules“ лип�ва информаци� за път� „%s“"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "към подмодула „%s“ не може да �е добави алтернативен източник: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13580,85 +13776,85 @@ msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
 "[--name ИМЕ] [--depth ДЪЛБОЧИ��] --url �ДРЕС --path ПЪТ…"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директори�та на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Път�т на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Веро�тно и�кахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пре�качане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�еу�пешен опит за клониране на „%s“.  �а�рочен е втори опит"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неу�пешен опит за клониране на „%s“.  Дей�твието �е преу�танов�ва"
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "път към работното дърво"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "път към работното дърво, през границите на вложените подмодули"
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "„rebase“ (пребазиране), „merge“ (�ливане), „checkout“ (изтегл�не) или "
 "„none“ (нищо да не �е прави)"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Плитко клониране, ограничено до указани� брой вер�ии"
+msgstr "Плитко клониране, отр�зано до указани� брой вер�ии"
 
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "брой паралелни проце�и"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както �е препоръчва"
 
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "неправилен параметър към опци�та „--update“"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13667,20 +13863,20 @@ msgstr ""
 "Клонът на подмодула „%s“ е на�троен да на�лед�ва клона от обхващащи� проект, "
 "но той не е на никой клон"
 
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper name embed-git-dir [ПЪТ…]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "„%s“ не поддържа опци�та „--super-prefix“"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -13693,23 +13889,23 @@ msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УК�З�ТЕЛ]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] ИМЕ"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "без извеждане на грешка за не�вързани (не�имволни) указатели"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "изтриване на �имволен указател"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "кратка информаци� за указател�"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "причина за обнов�ването"
 
@@ -13738,17 +13934,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=ФОРМ�Т] ЕТИКЕТ…"
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "етикетът „%s“ не е открит."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13761,7 +13957,7 @@ msgstr ""
 "  %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13776,142 +13972,142 @@ msgstr ""
 "Редовете, които започват � „%c“, �ъщо ще бъдат включени — може да ги "
 "изтриете вие.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "етикетът не може да бъде подпи�ан"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "файлът за етикета не може да бъде запазен"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "лип�ва �ъобщение за етикета"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "извеждане на имената на етикетите"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "извеждане на този БРОЙ редове от в��ко �ъобщение за етикет"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "изтриване на етикети"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "проверка на етикети"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Опции при �ъздаването на етикети"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "анотирането на етикети изи�ква �ъобщение"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "СЪОБЩЕ�ИЕ за етикет"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "анотиран етикет � подпи� по GPG"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "използване на друг ключ за подпи�ването на етикет"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "зам�на на етикета, ако �ъще�твува"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "�ъздаване на журнал на указателите"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Опции за извеждането на етикети"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "извеждане на �пи�ъка на етикетите по колони"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "извеждане �амо на етикетите, които �ъдържат подаването"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "извеждане �амо на етикетите, които не �ъдържат подаването"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "извеждане �амо на �летите етикети"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "извеждане �амо на не�летите етикети"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "Опциите „--column“ и „-n“ �а не�ъвме�тими"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "Опци�та „-n“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "Опци�та „-contains“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Опци�та „-contains“ изи�ква  режим на �пи�ък."
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "Опци�та „-points-at“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "Опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
 
-#: builtin/tag.c:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "Опциите „-F“ и „-m“ �а не�ъвме�тими."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "Прекалено много аргументи"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -13990,137 +14186,137 @@ msgstr ""
 msgid " OK"
 msgstr " Добре"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr ""
 "продължаване � обнов�ването, дори когато индек�ът тр�бва да бъде обновен"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "подмодулите да �е игнорират при обнов�ването"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "новите файлове да не �е игнорират"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "файлове да могат да замен�т директории и обратно"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "предупреждаване при лип�ващи в работното дърво файлове"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "обнов�ване дори и индек�ът да �ъдържа не�лети обекти"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "обнов�ване на информаци�та от функци�та „stat“"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "като опци�та „--refresh“, но да �е провер�т и обектите, които �а били приети "
 "за непроменени"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "добав�не на изброените обекти към индек�а"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "задаване на флаг, че файлът не �е промен�"
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "изчи�тване на флага, че файлът не �е промен�"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "задаване на флаг, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "изчи�тване на флага,  че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr "добав�не �амо към индек�а без добав�не към базата от данни за обектите"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr "изтриване на указаните пътища, дори и да �ъще�твуват в работното дърво"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "при комбиниране � опци�та „--stdin“ — входните редове �а разделени � нулеви� "
 "байт"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "изчитане на �пи�ъка � пътища за обнов�ване от �тандартни� вход"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "добав�не на елементите от �тандартни� вход към индек�а"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "въз�танов�ване на �ъ�то�нието преди �ливане или нужда от обнов�ване за "
 "изброените пътища"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "добав�не �амо на �ъдържанието, което �е различава от това в „HEAD“"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "игнориране на файловете, които лип�ват в работното дърво"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "извеждане на дей�тви�та на �тандартни� изход"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "забрав�не на запи�аната информаци� за неразрешени конфликти — за командите "
 "от потребител�ко ниво"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "запи�ване на индек�а в този формат"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "включване или изключване на раздел�нето на индек�а"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "включване/изключване на кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверка дали файловата �и�тема поддържа кеш за не�ледени файлове"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "включване на кеша за не�ледените файлове без проверка на файловата �и�тема"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -14128,7 +14324,7 @@ msgstr ""
 "�а�тройката „core.splitIndex“ е зададена на „false“ (лъжа).  Сменете � или � "
 "изтрийте, за да включите раздел�нето на индек�а"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -14136,7 +14332,7 @@ msgstr ""
 "�а�тройката „core.splitIndex“ е зададена на „true“ (и�тина).  Сменете � или "
 "� изтрийте, за да изключите раздел�нето на индек�а."
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -14144,11 +14340,11 @@ msgstr ""
 "�а�тройката „core.untrackedCache“ е зададена на „true“ (и�тина).  Сменете � "
 "или � изтрийте, за да изключите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "Кешът за не�ледените файлове е изключен"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -14156,7 +14352,7 @@ msgstr ""
 "�а�тройката „core.untrackedCache“ е зададена на „false“ (лъжа).  Сменете � "
 "или � изтрийте, за да включите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кешът за не�ледените файлове е включен за „%s“"
@@ -14173,21 +14369,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_Ð�Ð�_УКÐ�ЗÐ�ТЕЛ Ð�ОВÐ�_СÐ
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "изтриване на указател�"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "обнов�ване на ИМЕто_��_УК�З�ТЕЛ�, а не това, към което �очи"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 "н�кои от елементите подадени на �тандартни� вход завършват � нулеви� знак "
 "„NUL“"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "изчитане на указателите от �тандартни� вход"
 
@@ -14251,105 +14447,114 @@ msgstr "git worktree prune [ОПЦИЯ…]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ПЪТ]"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректори�"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не �ъще�твува"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
 
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
+"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Изтриване на „worktrees/%s“: файлът „gitdir“ �очи не�ъще�твуващо "
 "ме�тоположение"
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "докладване на ока�трените работни дървета"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "об�в�ване на работните копи� по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече �ъще�твува"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготв�не на %s (идентификатор %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегл�не КЛО�а, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "�ъздаване на нов клон"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "�ъздаване или занул�ване на клони"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "подготв�не на новото работно дърво"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да о�тане заключено"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "Опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "причина за заключване"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "„%s“ не е работно дърво"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "О�новното дърво не може да �е отключи или заключи"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
@@ -14374,24 +14579,24 @@ msgstr "�амо за изчи�тване на грешки"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "изход �лед първоначалната разм�на на за�вка и отговор"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "изход �лед първоначалната об�ва на указатели"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "да не �е тър�и „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "тран�ферът да �е преу�танови �лед този БРОЙ �екунди"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14406,7 +14611,7 @@ msgstr ""
 "\n"
 "    chmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "извеждане на �ъобщени�та за тра�иране на �тандартната грешка"
 
@@ -14416,30 +14621,28 @@ msgid ""
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr ""
-"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
-"наличните\n"
-"ръковод�тва.  За помощ за �пецифична КОМ��Д� ползвайте „git help КОМ��Д�“, а "
-"за\n"
+"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда наличните\n"
+"ръковод�тва.  За помощ за �пецифична КОМ��Д� ползвайте „git help КОМ��Д�“, а за\n"
 "н�кое определено ПО�ЯТИЕ използвайте „git help ПО�ЯТИЕ“.\n"
 "\n"
 "Българ�ки превод на книгата „Pro Git“ от Чакън и Страуб:\n"
 "http://i-can.eu/progit2-bg/progit.html"
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 "отрицателна �тойно�т за „http.postbuffer“. Ще �е ползва �тандартната: %d"
 
-#: http.c:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Управлението на делегирането не �е поддържа от cURL < 7.22.0"
 
-#: http.c:367
+#: http.c:368
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.44.0"
 
-#: http.c:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14816,7 +15019,7 @@ msgstr "�е може да �е открие общо подаване � „$pr
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "Вече е обновено до „$pretty_name“"
 
 #: git-merge-octopus.sh:89
@@ -14835,54 +15038,56 @@ msgstr "ПроÑ�тото Ñ�ливане не Ñ�работи, пробва Ñ�е Ð
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"След коригирането на този проблем изпълнете „git rebase --continue“.\n"
+"След коригирането на конфликтите, отбележете решаването им чрез:\n"
+"„git add/rm Ф�ЙЛ_С_КО�ФЛИКТ…“ и изпълнете „git rebase --continue“.\n"
 "�ко предпочитате да пре�кочите тази кръпка, изпълнете „git rebase --skip“.\n"
 "За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
 "изпълнете „git rebase --abort“."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Връщането към „${head_name}“ е невъзможно"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "�втоматично �катаното е приложено."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "„${stash_sha1}“ не може да бъде запазен"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr ""
 "Изглежда, че �ега �е прилагат кръпки чрез командата „git-am“.  �е може да "
 "пребазирате в момента."
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опци�та „--edit-todo“ е до�тъпна �амо по време на интерактивно пребазиране."
 
-#: git-rebase.sh:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде прочетен"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14890,7 +15095,7 @@ msgstr ""
 "Тр�бва да редактирате в�ички конфликти при �ливането.  След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14911,106 +15116,106 @@ msgstr ""
 "за\n"
 "да не загубите �лучайно промени."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "неправилна о�нова за �равнение „${upstream_name}“"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 "указател�т „${onto_name}“ може да �очи към повече от една о�нова за "
 "пребазирането"
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "указател�т „${onto_name}“ не �очи към никаква о�нова за пребазирането"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Указател�т „${onto_name}“ не �очи към подаване"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "Ф�Т�Л�� ГРЕШК�: не �ъще�твува клон „${branch_name}“"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "�е може да �е �катае автоматично"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�втоматично �катано: „${stash_abbrev}“"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Промените тр�бва или да �е подадат, или да �е �ката�т."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Текущи�т клон „${branch_name}“ е напълно актуален."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 "Текущи�т клон „${branch_name}“ е напълно актуален.  Пребазирането е "
 "принудително."
 
-#: git-rebase.sh:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Промените от „${mb}“ към „${onto}“:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "Първо, указател�т „HEAD“ започва да �очи към базата, върху ко�то пребазирате…"
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "Командата „git stash clear“ не поддържа аргументи"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "В�е още лип�ва първоначално подаване"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "Съ�то�нието на текущи� индек� не може да бъде запазено"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "�е�ледените файлове не могат да �е запаз�т"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "�е �а избрани никакви промени"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Временни�т индек� не може да бъде изтрит"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
@@ -15026,7 +15231,7 @@ msgstr ""
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -15035,110 +15240,110 @@ msgstr ""
 "грешка: командата „git stash save“ не поддържа опци� „${option}“\n"
 "        За да зададете �ъобщение, изпълнете „git stash save -- '${option}'“"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Опци�та „--patch“ е не�ъвме�тима � „--include-untracked“ и „--all“"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "��ма никакви локални промени за �катаване"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "Скатаването не може да �тартира"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "Текущото �ъ�то�ние не може да бъде запазено"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 "Съ�то�нието на работната директори� и индек�а �а запазени: „$stash_msg“"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "Промените в работното дърво не могат да бъдат занулени"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "непозната опци�: ${opt}"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "�е е открито нищо �катано."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Указани �а прекалено много вер�ии: „${REV}“"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "Указател�т „${reference}“ е грешен"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "„${args}“ не е подаване, приличащо на нещо �катано"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "„${args}“ не е указател към нещо �катано"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "индек�ът не може да бъде обновен"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "По време на �ливане не може да приложите нещо �катано"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 "В индек�а има конфликти.  Пробвайте да изпълните командата без опци�та „--"
 "index“."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "Дървото �очено от индек�а не може да бъде запазено"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr "�е�ледени файлове не могат да �е въз�танов�т от �катаното"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "Променените файлове не могат да бъдат извадени от индек�а"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "Индек�ът не е �катан."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в �лучай, че ви потр�бва отново"
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Изтрито е �катаното „${REV}“ ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "Скатаното „${REV}“ не може да бъде изтрито"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "�е е указано име на клон"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(За да ги въз�тановите, изпълнете командата „git stash apply“)"
 
@@ -15294,17 +15499,17 @@ msgstr ""
 "Премахната е реги�траци�та на подмодул „${name}“, �очещ към адре� „${url}“, "
 "за път� „${displaypath}“"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Текущата вер�и� за подмодула в „${displaypath}“ лип�ва"
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15313,12 +15518,12 @@ msgstr ""
 "Текущата вер�и� „${remote_name}/${branch}“ в път� към подмодул „${sm_path}“ "
 "лип�ва"
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15327,93 +15532,93 @@ msgstr ""
 "Подмодулът в път� „$displaypath“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
 "„$sha1“.  Директното до�тав�не на това подаване е неу�пешно."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изтегл�не на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“'"
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: изтеглена е вер�и� „${sha1}“"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно пребазиране на вер�и� „${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: пребазиране върху вер�и� „${sha1}“"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно �ливане на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: �ливане � вер�и� „${sha1}“"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изпълнение на командата „${command} ${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опциите „--cached“ и „--files“ �а не�ъвме�тими"
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неочакван режим „${mod_dst}“"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_src}“"
 
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 "  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_dst}“"
 
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Синхронизиране на адре�а за път� към подмодул „${displaypath}“"
@@ -15432,13 +15637,13 @@ msgstr "Пребазиране ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -15527,49 +15732,49 @@ msgstr "УказателÑ�Ñ‚ „HEAD“ не може да Ñ�е наÑ�очи кÑ
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Подаването не може да �е �мачка: „$sha1“"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Грешка при повтар�нето на �ливането на „$sha1“"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "„$sha1“ не може да �е отбере."
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Това е �ъобщение при подаване №${n}:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Съобщение при подаване №${n} ще бъде пре�кочено."
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�овото �ъобщение при подаване „$fixup_msg“ не може да бъде запазено"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Това е обединение от 2 подавани�"
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "�е може да �е подаде $sha1… $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15585,31 +15790,31 @@ msgstr ""
 "коригирате,\n"
 "преди да можете да промените подаването."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Спиране при „$sha1_abbrev…“ $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „$squash_style“"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "В момента �е изпълн�ва: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "�еу�пешно изпълнение: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 msgid "and made changes to the index and/or the working tree"
 msgstr "и промени индек�а и/или работното дърво"
 
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15620,7 +15825,7 @@ msgstr ""
 "    git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15635,99 +15840,29 @@ msgstr ""
 "\n"
 "    git rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "�епозната команда: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Коригирайте това чрез „git rebase --edit-todo“."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "У�пешно пребазиране и обнов�ване на „$head_name“."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Излишните команди да отбиране не могат да бъдат пре�кочени"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Предупреждение: �умата по SHA1, указана към командата на реда:\n"
-" - $line\n"
-" лип�ва или не е пред�тавл�ва подаване"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Предупреждение: непозната команда на ред:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "указател�т „HEAD“ не може да �е отдели"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Предупреждение: н�кои подавани� може да �а пропу�нати.\n"
-"\n"
-"Пропу�нати подавани� (новите �а най-отгоре):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"За да не получавате това �ъобщение, изрично ползвайте командата „drop“.\n"
-"\n"
-"�а�тройката „rebase.missingCommitsCheck“ управл�ва нивото на предупреждение\n"
-"Възможните �тойно�ти �а „ignore“ (пренебрегване), „warn“ (�амо "
-"предупреждение)\n"
-"или „error“ (�читане за грешка)."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"�епозната �тойно�т „$check_level“ за на�тройката „rebase."
-"missingCommitsCheck“.\n"
-"�а�тройката �е пре�кача."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Можете да промените това � командите „git rebase --edit-todo“ и „git rebase "
-"--continue“ �лед това."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-"Може и да преу�тановите пребазирането � командата „git rebase --abort“."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15757,11 +15892,11 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 msgid "Error trying to find the author identity to amend commit"
 msgstr "�е може да бъде открит автор за поправ�нето на подаването"
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15769,11 +15904,11 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "Промените в индек�а не могат да бъдат подадени."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15787,33 +15922,33 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "Тек�тови�т редактор не може да бъде �тартиран"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "„$switch_to“ не може да �е изтегли"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "Лип�ва указател „HEAD“"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Временната директори� „$state_dir“ не може да бъде �ъздадена"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "Пребазирането не е интерактивно"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "Спи�ъкът � презапи�аните подавани� не може да бъде �ъздаден"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -15822,7 +15957,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
 
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15832,7 +15967,7 @@ msgstr ""
 "�ко изтриете в�ичко, пребазирането ще бъде преу�тановено.\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Празните подавани� �а коментирани"
 
@@ -16450,64 +16585,64 @@ msgstr ""
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "разликата между ме�тни� ча�ови� по�� и GMT е 24 ча�а или повече\n"
 
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "тек�тови�т редактор приключи работата � грешка, в�ичко �е преу�танов�ва"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s“ �ъдържа временна вер�и� на подготв�ното е-пи�мо.\n"
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ �ъдържа подготвеното е-пи�мо.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опци�та „--dump-aliases“ е не�ъвме�тима � другите опции\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Командата „git format-patch“ не може да �е изпълни извън хранилище\n"
 
-#: git-send-email.perl:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�епознато поле за опци�та „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�епозната �тойно�т за „--confirm“: %s\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: �иноними за sendmail �ъдържащи кавички („\"“) не �е "
 "поддържат: %s\n"
 
-#: git-send-email.perl:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: „:include:“ не �е поддържа: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: прена�очвани� „/file“ или „|pipe“ не �е поддържат: %s\n"
 
-#: git-send-email.perl:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16522,12 +16657,12 @@ msgstr ""
 "    � укажете „./%s“ за файл;\n"
 "    � използвате опци�та „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директори�та „%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16536,7 +16671,7 @@ msgstr ""
 "Ф�Т�Л�� ГРЕШК�: %s: %s\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16546,17 +16681,17 @@ msgstr ""
 "�е �а указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ лип�ва тема"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да �е отвори за запи�: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16571,32 +16706,32 @@ msgstr ""
 "\n"
 "Изтрийте в�ичко, ако не и�кате да изпратите обобщаващо пи�мо.\n"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "„%s.final“ не може да �е отвори: %s"
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 msgid "Summary email is empty, skipping it\n"
 msgstr "Обобщаващото пи�мо е празно и �е пре�кача\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Сигурни ли �те, че и�кате да ползвате „%s“ [y/N]? "
 
-#: git-send-email.perl:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16604,11 +16739,11 @@ msgstr ""
 "Следните файлове �а 8 битови, но не �а � об�вена заглавна ча�т „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране �е ползва [�тандартно: UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16621,22 +16756,22 @@ msgstr ""
 "в�е още е � шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опци�та\n"
 "„--force“, ако �те �игурни, че точно това и�кате да изпратите.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "�а кой да �е прат�т е-пи�мата (незадължително поле)"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ е �иноним на �ебе �и\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ГРЕШК�: не може да �е извлече адре� от „%s“\n"
@@ -16644,18 +16779,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Какво да �е направи � този адре�? „q“ (�пиране), „d“ (изтриване), "
 "„e“ (редактиране): "
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Път�т към �ертификат „%s“ не �ъще�твува."
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16683,131 +16818,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:1335
+#: git-send-email.perl:1350
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 "Изпращане на е-пи�мото? „y“ (да), „n“ (не), „q“ (изход), „a“ (в�ичко): "
 
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Изи�кване на отговор към това е-пи�мо"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е на�троен правилно."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "�еу�пешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Под�и�темата за SMTP не може да �е инициализира. Проверете на�тройките и "
 "използвайте опци�та: „--smtp-debug“."
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "У�пех при пробата. От журнала:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "У�пех. От журнала:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Резултат: у�пех\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „до: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(не-mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(т�ло) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е може да бъде �е изпълни „%s“"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добав�не на „%s: %s“ от: „%s“\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмни�т канал не може да �е затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "�ъобщението не може да �е изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за прено�"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "„%s“ не може да �е отвори: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "„%s“: кръпката �ъдържа ред � над 988 знака"
 
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, 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 a7bc71fc6..4dc7b9cb1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -19,6 +19,7 @@
 #   repository       |  dipòsit
 #   skip             |  ometre
 #   squelch          |  silenciar
+#   setting          |  paràmetre
 #   token            |  testimoni
 #
 # Alguns termes que són comandes específiques del git i d'àmbit molt tècnic
@@ -36,14 +37,15 @@
 #   cherry pick      |  «cherry pick»
 #   rebase           |  «rebase»
 #   stage            |  «stage»
+#   stash            |  «sta»
 #   squash           |  «squash»
 #   unstage          |  «unstage»
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-18 20:41+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-15 22:15+0200\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -51,7 +53,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 2.0.1\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: advice.c:58
 #, c-format
@@ -96,7 +98,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
@@ -123,7 +125,7 @@ msgid ""
 "  git checkout -b <new-branch-name>\n"
 "\n"
 msgstr ""
-"Avís: s'està agafant '%s'.\n"
+"Avís: s'està agafant «%s».\n"
 "\n"
 "Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n"
 "experimentals i cometre-los i podeu descartar qualsevol comissió que feu\n"
@@ -138,92 +140,92 @@ msgstr ""
 #: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
-msgstr "opció d'espai en blanc '%s' no reconeguda"
+msgstr "opció d'espai en blanc «%s» no reconeguda"
 
 #: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda"
+msgstr "opció d'ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject i --3way no es poden usar junts."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached i --3way no es poden usar junts."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way fora d'un dipòsit"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index fora d'un dipòsit"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached fora d'un dipòsit"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No es pot preparar l'expressió regular de marca de temps %s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec ha retornat %d per l'entrada: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, 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:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
 
-#: apply.c:1008
-#, fuzzy, c-format
+#: apply.c:1007
+#, c-format
 msgid "invalid mode on line %d: %s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "mode no vàlid en la línia %d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "línies de capçalera %d i %d inconsistents"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recompte: línia inesperada: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, 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:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -238,83 +240,83 @@ 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)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, 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)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depèn dels continguts antics"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "el fitxer suprimit encara té continguts"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "pedaç malmès a la línia %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "el fitxer nou %s depèn dels continguts antics"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el fitxer suprimit %s encara té continguts"
 
-#: apply.c:1848
+#: apply.c:1865
 #, 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:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaç binari malmès a la línia %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaç binari no reconegut a la línia %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaç amb només escombraries a la línia %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: '%c'"
 
-#: apply.c:3052
+#: apply.c:3077
 #, 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:3064
+#: apply.c:3089
 #, 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:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -323,311 +325,311 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
-msgstr "manquen les dades de pedaç binari de '%s'"
+msgstr "manquen les dades de pedaç binari de «%s»"
 
-#: apply.c:3100
+#: apply.c:3125
 #, 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'"
+msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
 
-#: apply.c:3146
+#: apply.c:3171
 #, 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"
+"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
 
-#: apply.c:3156
+#: apply.c:3181
 #, 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 "
+"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
 "actuals."
 
-#: apply.c:3164
+#: apply.c:3189
 #, 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"
+msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
 
-#: apply.c:3182
+#: apply.c:3207
 #, 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'"
+msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
-msgstr "el pedaç binari no s'aplica a '%s'"
+msgstr "el pedaç binari no s'aplica a «%s»"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
-"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
+"el pedaç binari a «%s» crea un resultat incorrecte (esperant %s, %s rebut)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produït un error en llegir %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
+msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3556
+#: apply.c:3582
 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."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "S'està retrocedint a una fusió de 3 vies...\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
-msgstr "no es poden llegir els continguts actuals de '%s'"
+msgstr "no es poden llegir els continguts actuals de «%s»"
 
-#: apply.c:3591
+#: apply.c:3617
 #, 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:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
-msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
+msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
-msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
+msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
-msgstr "camí no vàlid: %s"
+msgstr "camí no vàlid: «%s»"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3941
+#: apply.c:3967
 #, 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:3946
+#: apply.c:3972
 #, 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:3966
+#: apply.c:3992
 #, 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"
+msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, 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:4083
+#: apply.c:4109
 #, 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:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí '%s'"
+msgstr "make_cache_entry ha fallat per al camí «%s»"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
-msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
+msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
 
-#: apply.c:4292
+#: apply.c:4318
 #, 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"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, 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:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer '%s'"
+msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
-msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
+msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4522
+#: apply.c:4548
 #, 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:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
-msgstr "S'ha omès el pedaç '%s'."
+msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "entrada no reconeguda"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
-msgstr "no es pot obrir el pedaç '%s': %s"
+msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, 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:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, 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:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -636,138 +638,139 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 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:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "camí"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "número"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "elimina <nombre> barres obliqües inicials dels camins de diferència "
 "tradicionals"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:4933
+#: apply.c:4959
 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"
 
-#: apply.c:4937
+#: apply.c:4963
 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:4939
+#: apply.c:4965
 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:4941
+#: apply.c:4967
 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:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4977
 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:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "acció"
 
-#: apply.c:4960
+#: apply.c:4986
 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"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "permet trossos encavalcants"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "sigues detallat"
 
-#: apply.c:4978
+#: apply.c:5004
 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:4981
+#: apply.c:5007
 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:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
@@ -790,108 +793,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 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"
+msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "format"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "fitxer"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "escriu l'arxiu a aquest fitxer"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "llegeix .gitattributes en el directori de treball"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "informa de fitxers arxivats en stderr"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "només emmagatzema"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "comprimeix més ràpidament"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "comprimeix millor"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "dipòsit"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "ordre"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "camí a l'ordre git-upload-archive remota"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "L'opció --exec només es pot usar junt amb --remote"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
-msgstr "Format d'arxiu desconegut '%s'"
+msgstr "Format d'arxiu desconegut «%s»"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admès per al format '%s': -%d"
+msgstr "Paràmetre no admès per al format «%s»: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no és un nom d'atribut vàlid"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -902,7 +905,7 @@ msgstr ""
 #: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
-msgstr "Comentari amb cometes errònies en el fitxer '%s': %s"
+msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
 
 #: bisect.c:655
 #, c-format
@@ -939,7 +942,7 @@ msgid ""
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 "La base de fusió %s és %s.\n"
-"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
+"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
 
 #: bisect.c:750
 #, c-format
@@ -969,31 +972,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
-msgstr "no s'ha pogut crear el fitxer '%s'"
+msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
-msgstr "no s'ha pogut llegir el fitxer '%s'"
+msgstr "no s'ha pogut llegir el fitxer «%s»"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1002,7 +1005,7 @@ msgstr ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí dolents?\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1012,7 +1015,7 @@ msgstr[1] "(aproximadament %d passos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1033,10 +1036,10 @@ msgstr ""
 "--reverse i --first-parent-together requereixen una última comissió "
 "especificada"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "la configuració del passeig per revisions ha fallat"
 
@@ -1077,50 +1080,53 @@ msgstr "No s'està establint la branca %s com a la seva pròpia font."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+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."
+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»."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+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»."
+"La branca «%s» està configurada per a seguir la branca local «%s» fent "
+"«rebase»."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "La branca %s està configurada per a seguir la branca local %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+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 "
+"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."
+msgid "Branch '%s' set up to track remote ref '%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."
+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 "
+"La branca «%s» està configurada per a seguir la referència local «%s» fent "
 "«rebase»."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branca %s està configurada per a seguir la referència local %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1134,30 +1140,30 @@ msgstr "No seguint: informació ambigua per a la referència %s"
 #: branch.c:185
 #, c-format
 msgid "'%s' is not a valid branch name."
-msgstr "'%s' no és un nom de branca vàlid."
+msgstr "«%s» no és un nom de branca vàlid."
 
 #: branch.c:190
 #, c-format
 msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom '%s' ja existeix."
+msgstr "Una branca amb nom «%s» ja existeix."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "No es pot actualitzar la branca actual a la força."
 
-#: branch.c:218
+#: branch.c:217
 #, 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 "
+"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
 "una branca."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
-msgstr "la branca font demanada '%s' no existeix"
+msgstr "la branca font demanada «%s» no existeix"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1178,100 +1184,102 @@ msgstr ""
 "\"git push -u\" per a establir la configuració font\n"
 "mentre pugeu."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: '%s'."
+msgstr "No és un nom d'objecte vàlid: «%s»."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: '%s'."
+msgstr "Nom d'objecte ambigu: «%s»."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: '%s'."
+msgstr "No és un punt de ramificació vàlid: «%s»."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ja s'ha agafat a '%s'"
+msgstr "«%s» ja s'ha agafat a «%s»"
 
 #: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
-msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
+msgstr "HEAD de l'arbre de treball %s no està actualitzat"
 
 #: bundle.c:34
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no sembla un fitxer de farcell v2"
+msgstr "«%s» no sembla un fitxer de farcell v2"
 
 #: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
-msgstr "no s'ha pogut obrir '%s'"
+msgstr "no s'ha pogut obrir «%s»"
 
 #: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, 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:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "El farcell registra una història completa."
 
-#: bundle.c:195
+#: bundle.c:202
 #, 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:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "No s'ha pogut executar el pack-objects"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "El pack-objects s'ha mort"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "El rev-list s'ha mort"
 
-#: bundle.c:356
+#: bundle.c:363
 #, 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'"
+msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "paràmetre no reconegut: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "S'està refusant crear un farcell buit."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
-msgstr "no es pot crear '%s'"
+msgstr "no es pot crear «%s»"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "L'index-pack s'ha mort"
 
@@ -1280,8 +1288,8 @@ msgstr "L'index-pack s'ha mort"
 msgid "invalid color value: %.*s"
 msgstr "valor de color no vàlid: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "no s'ha pogut analitzar %s"
@@ -1291,7 +1299,7 @@ msgstr "no s'ha pogut analitzar %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s no és una comissió!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1306,160 +1314,160 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "memòria esgotada"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "línia de configuració %d errònia en el blob %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "línia de configuració %d errònia en el fitxer %s"
 
-#: config.c:728
+#: config.c:729
 #, 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:732
+#: config.c:733
 #, 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:736
+#: config.c:737
 #, 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:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "línia de configuració %d errònia en %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "unitat no vàlida"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèric erroni '%s' per '%s': %s"
+msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
 
-#: config.c:879
+#: config.c:880
 #, 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"
+msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
 
-#: config.c:882
+#: config.c:883
 #, 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"
+msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
 
-#: config.c:885
+#: config.c:886
 #, 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"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
 
-#: config.c:888
+#: config.c:889
 #, 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 "
+"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
 "%s: %s"
 
-#: config.c:891
+#: config.c:892
 #, 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: "
+"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
 "%s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
+msgstr "valor de configuració numèric dolent «%s» per «%s» en %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, 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'"
+msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressió de zlib dolent %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivell de compressió de paquet %d Erroni"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
-msgstr "%s no vàlid: %s"
+msgstr "%s no vàlid: «%s»"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2122
+#: config.c:2167
 #, 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"
+msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
 
-#: config.c:2124
+#: config.c:2169
 #, 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"
+msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat fstat a %s"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
-msgstr "no s'ha pogut establir '%s' a '%s'"
+msgstr "no s'ha pogut establir «%s» a «%s»"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
-msgstr "no s'ha pogut desestablir '%s'"
+msgstr "no s'ha pogut desestablir «%s»"
 
 #: connect.c:50
 msgid "The remote end hung up upon initial contact"
@@ -1477,19 +1485,19 @@ msgstr ""
 "Si us plau, assegureu-vos que tingueu els permisos\n"
 "d'accés correctes i que el dipòsit existeixi."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "No s'ha pogut executar 'git rev-list'"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "escriptura fallada al rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produït un error en tancar l'stdin del rev-list"
 
@@ -1594,36 +1602,42 @@ msgstr[1] "fa %<PRIuMAX> anys"
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres '%s'"
+msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
 
 #: diffcore-rename.c:536
 msgid "Performing inexact rename detection"
 msgstr "S'està realitzant una detecció inexacta de canvis de nom"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
-msgstr "l'opció '%s' requereix un valor"
+msgstr "l'opció «%s» requereix un valor"
 
-#: diff.c:125
+#: 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"
+"«%s»\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  Paràmetre de dirstat desconegut '%s'\n"
+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'"
+msgstr ""
 
-#: diff.c:282
+#: 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'"
+"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1632,20 +1646,20 @@ msgstr ""
 "S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'està aturant a %s"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check i -s són mutualment exclusius"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1654,22 +1668,22 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, 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'"
+"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
 
-#: diff.c:4716
+#: diff.c:5505
 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:4719
+#: diff.c:5508
 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."
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1677,208 +1691,212 @@ msgstr ""
 "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
 "l'ordre."
 
-#: dir.c:1948
+#: dir.c:1983
 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:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'ha pogut crear directoris per %s"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "no s'ha pogut migrar el directori de '%s' a '%s'"
+msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
+
+#: entry.c:176
+msgid "Filtering content"
+msgstr "S'està filtrant el contingut"
 
-#: entry.c:281
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista superficial esperada"
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
+msgstr "git fetch-pack: ACK/NAK esperat, «%s» rebut"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requereix multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línia de shallow no vàlida: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línia d'unshallow no vàlida: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s rebut"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "s'està rendint"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 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:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "El servidor accepta multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "El servidor accepta no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "El servidor accepta multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "El servidor accepta side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "El servidor accepta banda lateral"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "El servidor accepta allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "El servidor accepta allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "El servidor accepta ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
@@ -1891,35 +1909,35 @@ msgstr "gpg ha fallat en signar les dades"
 msgid "could not create temporary file"
 msgstr "no s'ha pogut crear el fitxer temporal"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
-msgstr "s'ha produït un error en escriure la signatura separada a '%s'"
+msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
 
 #: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora el color invàlid '%.*s' en log.graphColors"
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
-msgstr "'%s': no s'ha pogut llegir %s"
+msgstr "«%s»: no s'ha pogut llegir %s"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 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'"
+msgstr "s'ha produït un error en fer stat a «%s»"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
-msgstr "'%s': lectura curta"
+msgstr "«%s»: lectura curta"
 
 #: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
-msgstr "ordres de git disponibles en '%s'"
+msgstr "ordres de git disponibles en «%s»"
 
 #: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
@@ -1936,7 +1954,7 @@ msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
-"'%s' sembla una ordre de git, però no hem pogut\n"
+"«%s» sembla una ordre de git, però no hem pogut\n"
 "executar-la. Pot ser que git-%s estigui malmès?"
 
 #: help.c:336
@@ -1944,27 +1962,25 @@ msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
 
 #: help.c:358
-#, fuzzy, c-format
+#, 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.\n"
-"S'està continuant sota l'assumpció que volíeu dir '%s'"
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
 
 #: help.c:363
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
+msgstr "Es continua amb l'assumpció de que volíeu dir «%s»."
 
 #: help.c:368
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
+msgstr "Es continua en %0.1f segons, assumint que volíeu dir «%s»."
 
 #: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."
+msgstr "git: «%s» no és una ordre de git. Vegeu 'git --help'."
 
 #: help.c:380
 msgid ""
@@ -1974,7 +1990,11 @@ msgid_plural ""
 "\n"
 "The most similar commands are"
 msgstr[0] ""
+"\n"
+"L'ordre més similar és"
 msgstr[1] ""
+"\n"
+"Les ordres més similar són"
 
 #: help.c:395
 msgid "git version [<options>]"
@@ -2034,7 +2054,7 @@ msgstr ""
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
-"no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' "
+"no s'ha pogut detectar automàticament una adreça de correu vàlida («%s» "
 "rebut)"
 
 #: ident.c:381
@@ -2045,7 +2065,7 @@ msgstr ""
 #: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
-msgstr "no s'ha pogut detectar automàticament el nom ('%s' rebut)"
+msgstr "no s'ha pogut detectar automàticament el nom («%s» rebut)"
 
 #: ident.c:395
 #, c-format
@@ -2055,14 +2075,14 @@ msgstr ""
 #: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
-msgstr ""
+msgstr "el nom conté només caràcters no permesos: %s"
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vàlid: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2082,7 +2102,7 @@ msgstr ""
 "git ha tingut una pana:\n"
 "elimineu el fitxer manualment per a continuar."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "No s'ha pogut crear '%s.lock': %s"
@@ -2091,78 +2111,78 @@ msgstr "No s'ha pogut crear '%s.lock': %s"
 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:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex nou"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(comissió errònia)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache ha fallat per al camí '%s'"
+msgstr "addinfo_cache ha fallat per al camí «%s»"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "error en construir arbres"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
-msgstr "s'ha produït un error en crear el camí '%s'%s"
+msgstr "s'ha produït un error en crear el camí «%s»%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
-msgstr "no es pot llegir l'objecte %s '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s '%s'"
+msgstr "blob esperat per a %s «%s»"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
-msgstr "s'ha produït un error en obrir '%s': %s"
+msgstr "s'ha produït un error en obrir «%s»: %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
-msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s"
+msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se sap què fer amb %06o %s '%s'"
+msgstr "no se sap què fer amb %06o %s «%s»"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "S'ha produït un error en executar la fusió interna"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No s'ha pogut afegir %s a la base de dades"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2171,7 +2191,7 @@ msgstr ""
 "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:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2180,7 +2200,7 @@ 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."
 
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2189,7 +2209,7 @@ 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."
 
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2198,20 +2218,20 @@ 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."
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, 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:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2220,143 +2240,143 @@ 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"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (deixat sense resolució)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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"
 
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
 #, 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:1529
+#: merge-recursive.c:1553
 #, 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"
 
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "S'està afegint %s fusionat"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objecte %s no és un blob"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "modificació"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "contingut"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "afegiment/afegiment"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, 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:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "S'està autofusionant %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "submòdul"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "S'està eliminant %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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"
 
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "S'està afegint %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Ja està al dia!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusió dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Fusionant:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, 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:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "la fusió no ha retornat cap comissió"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte '%s'"
+msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'índex."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2367,7 +2387,7 @@ msgstr ""
 "Si us plau, 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:280
+#: 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)."
@@ -2379,7 +2399,7 @@ msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
 #: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode erroni: '%s'"
+msgstr "Valor de notes.rewriteMode erroni: «%s»"
 
 #: notes-utils.c:111
 #, c-format
@@ -2393,18 +2413,34 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 #: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
-msgstr "Valor erroni de %s: '%s'"
+msgstr "Valor erroni de %s: «%s»"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+
+#: packfile.c:1683
+#, 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?)"
+
+#: packfile.c:1687
+#, 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?)"
+
 #: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "ús: %s"
@@ -2412,26 +2448,26 @@ msgstr "ús: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr " o: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-NUM"
 
 #: parse-options-cb.c:108
 #, c-format
 msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format '%s'"
+msgstr "nom d'objecte mal format «%s»"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No s'ha pogut fer %s escrivible pel grup"
@@ -2458,7 +2494,7 @@ msgstr "nom d'atribut no vàlid %s"
 #: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
-"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
+"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són "
 "incompatibles"
 
 #: pathspec.c:265
@@ -2466,8 +2502,8 @@ msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
-"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
-"els altres ajusts 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'"
@@ -2476,17 +2512,17 @@ msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'"
 #: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
+msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
 
 #: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'"
+msgstr "')' mancant al final de la màgia d'especificació de camí en «%s»"
 
 #: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
+msgstr "Màgia d'especificació de camí no implementada '%c' en «%s»"
 
 #: pathspec.c:428
 #, c-format
@@ -2496,12 +2532,12 @@ msgstr "%s: 'literal' i 'glob' són incompatibles"
 #: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' és fora del dipòsit"
+msgstr "%s: «%s» és fora del dipòsit"
 
 #: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (mnemònic: '%c')"
+msgstr "«%s» (mnemònic: '%c')"
 
 #: pathspec.c:525
 #, c-format
@@ -2509,7 +2545,7 @@ 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"
 
-#: pathspec.c:575
+#: 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"
@@ -2518,12 +2554,12 @@ msgstr ""
 "versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb "
 "tots els camins"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, 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"
+msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
@@ -2545,50 +2581,51 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
-msgstr "no s'ha pogut tancar '%s'"
+msgstr "no s'ha pogut tancar «%s»"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
-msgstr "no s'ha pogut fer stat a '%s'"
+msgstr "no s'ha pogut fer stat a «%s»"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
-msgstr "No s'ha pogut obrir '%s' per a escriptura"
+msgstr "No s'ha pogut obrir «%s» per a escriptura"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, 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
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no s'ha pogut suprimir la referència %s: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no s'ha pogut suprimir les referències: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "no hi és"
@@ -2618,147 +2655,147 @@ msgstr "format esperat: %%(color:<color>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "valor enter esperat pel nom de referència:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "paràmetre %%(%s) desconegut: %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta paràmetres"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no accepta paràmetres"
 
-#: ref-filter.c:181
-#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) no accepta paràmetres"
+#: ref-filter.c:198
+#, fuzzy, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "paràmetre de reflexió desconegut: %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "paràmetre %%(contents) no reconegut: %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positiu esperat nom d'objecte:curt=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "paràmetre %%(objectname) no reconegut: %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posició>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posició no reconeguda:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "paràmetre %%(align) no reconegut: %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'àtom %%(align)"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "paràmetre %%(if) no reconegut: %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, 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:568
+#: ref-filter.c:596
 #, 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:570
+#: ref-filter.c:598
 #, 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:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, 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:600
+#: ref-filter.c:628
 #, 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:602
+#: ref-filter.c:630
 #, 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:615
+#: ref-filter.c:643
 #, 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:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(cap branca, s'està fent «rebase» %s)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(cap branca, bisecció començada en %s)"
@@ -2766,7 +2803,7 @@ msgstr "(cap branca, bisecció començada en %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD separat a %s)"
@@ -2774,116 +2811,116 @@ msgstr "(HEAD separat a %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD separat de %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(cap branca)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, 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:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
+msgstr "objecte mal format a «%s»"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "s'està ignorant la referència trencada %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: remote.c:747
+#: remote.c:750
 #, 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:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdós %s i %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Error intern"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: '%s'"
+msgstr "no hi ha tal branca: «%s»"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
-msgstr "cap font configurada per a la branca '%s'"
+msgstr "cap font configurada per a la branca «%s»"
 
-#: remote.c:1698
+#: remote.c:1699
 #, 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"
+msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
 
-#: remote.c:1713
+#: remote.c:1714
 #, 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"
+"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
-msgstr "la branca '%s' no té cap remot al qual pujar"
+msgstr "la branca «%s» no té cap remot al qual pujar"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
-msgstr "les especificacions de referència de '%s' no inclouen '%s'"
+msgstr "les especificacions de referència de «%s» no inclouen «%s»"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no té destí (push.default és 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
 
 #: remote.c:2076
 #, 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"
+msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
 
 #: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
@@ -2891,15 +2928,15 @@ msgstr "  (useu \"git branch --unset-upstream\" per a arreglar)\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "La vostra branca està al dia amb '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "La vostra branca està al dia amb «%s».\n"
 
 #: remote.c:2087
 #, 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"
+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
 msgid "  (use \"git push\" to publish your local commits)\n"
@@ -2911,10 +2948,10 @@ 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] ""
-"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se "
+"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 "
+"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se "
 "ràpidament.\n"
 
 #: remote.c:2104
@@ -2930,26 +2967,26 @@ msgid_plural ""
 "Your branch and '%s' have diverged,\n"
 "and have %d and %d different commits each, respectively.\n"
 msgstr[0] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissió distinta cada una, respectivament.\n"
 msgstr[1] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
 #: remote.c:2117
 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:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
-msgstr "la vostra branca actual '%s' encara no té cap comissió"
+msgstr "la branca actual «%s» encara no té cap comissió"
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent és incompatible amb --bisect"
 
@@ -2991,24 +3028,24 @@ msgstr "el destí receptor no admet pujar --atomic"
 msgid "the receiving end does not support push options"
 msgstr "el destí receptor no admet opcions de pujada"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acció desconeguda: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3016,7 +3053,7 @@ msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
 "corregits amb 'git add <camins>' o 'git rm <camins>'"
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3026,42 +3063,43 @@ msgstr ""
 "corregits amb 'git add <camins>' o 'git rm <camins>'\n"
 "i cometeu el resultat amb 'git commit'"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
-msgstr "no s'ha pogut bloquejar '%s'"
+msgstr "no s'ha pogut bloquejar «%s»"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
-msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
-msgstr "s'ha produït un error en finalitzar '%s'."
+msgstr "s'ha produït un error en finalitzar «%s»."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir '%s'"
+msgstr "no s'ha pogut llegir «%s»"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
-msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
@@ -3069,20 +3107,20 @@ msgstr "%s: avanç ràpid"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "no s'ha pogut resoldre la comissió HEAD\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "no s'ha pogut actualitzar l'arbre cau\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3112,17 +3150,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "no s'ha pogut analitzar la comissió %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "no s'ha pogut analitzar la comissió pare %s\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3133,7 +3171,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3144,230 +3182,231 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "cal un HEAD per reparar-ho"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
-msgstr "no es pot escriure '%s'"
+msgstr "no es pot escriure «%s»"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Aquest és el 1r missatge de comissió:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest és el missatge de comissió #%d:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El missatge de comissió núm. #%d s'ometrà:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, 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:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissió %s no té pare %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, 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ó."
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
-msgstr "no s'ha pogut canviar el nom '%s' a '%s'"
+msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, 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:1186
+#: sequencer.c:1188
 #, 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:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr "No es pot '%s' sense una comissió prèvia"
+msgstr "No es pot «%s» sense una comissió prèvia"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir '%s'."
+msgstr "no s'ha pogut llegir «%s»."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
-msgstr "full d'instruccions inusable: '%s'"
+msgstr "full d'instruccions inusable: «%s»"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
-msgstr "full d'opcions mal format: '%s'"
+msgstr "full d'opcions mal format: «%s»"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un «cherry pick» o una reversió ja està en curs"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
-msgstr "no es pot obrir '%s'"
+msgstr "no es pot obrir «%s»"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
-msgstr "no es pot llegir '%s': %s"
+msgstr "no es pot llegir «%s»: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, 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"
+msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
-msgstr "no s'ha pogut copiar '%s' a '%s'"
+msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "no s'ha pogut llegir l'índex"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3382,11 +3421,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 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:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3396,84 +3435,84 @@ msgid ""
 "  git rebase --continue\n"
 "\n"
 msgstr ""
-"L'execució ha tingut èxit: %s\n"
+"l'execució ha tingut èxit: %s\n"
 "però ha deixat canvis a l'índex i/o l'arbre de treball\n"
-"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
+"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:1925
-#, fuzzy, c-format
+#: sequencer.c:1948
+#, c-format
 msgid "Applied autostash.\n"
-msgstr "S'ha aplicat el magatzem automàtic."
+msgstr "S'ha aplicat el «stash» automàticament.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-"L'aplicació del magatzem automàtic ha resultat en conflictes.\n"
-"Els vostres canvis estan segurs en el magatzem.\n"
+"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
+"Els vostres canvis estan segurs en el «stash».\n"
 "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "No s'ha pogut llegir orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir 'onto'"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "no s'ha pogut analitzar %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
-msgstr "fitxer no vàlid: '%s'"
+msgstr "fitxer no vàlid: «%s»"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
-msgstr "contingut no vàlid: '%s'"
+msgstr "contingut no vàlid: «%s»"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3483,24 +3522,112 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
 "primer cometeu-los i després executeu 'git rebase --continue' de nou."
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "No s'ha pogut cometre els canvis «staged»."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer «cherry pick» a %s"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió dolenta"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: opcions no gestionades"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: s'ha produït un error preparant les revisions"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "llista per a fer inestable: «%s»"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: 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
+#, 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"
+"Les comissions descartades (més nova a més vella):\n"
+
+#: sequencer.c:2648
+#, 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"
+"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"
+"\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
+#, c-format
+msgid ""
+"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»"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "no s'ha pogut truncar a «%s»"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "l'script ja estava endreçat."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no s'ha pogut finalitzar «%s»"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3518,7 +3645,7 @@ msgid ""
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
+"paràmetre ambigu «%s»: revisió no coneguda o camí no en l'arbre de treball.\n"
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
@@ -3529,38 +3656,38 @@ msgid ""
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
+"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
-#: setup.c:504
+#: setup.c:499
 #, 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:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "s'han trobat extensions de dipòsit desconegudes:"
 
-#: setup.c:810
+#: setup.c:806
 #, 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:812 builtin/index-pack.c:1652
+#: 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:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
-msgstr "No es pot canviar a '%s'"
+msgstr "No es pot canviar a «%s»"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3570,7 +3697,7 @@ msgstr ""
 "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "no està establert)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3581,58 +3708,42 @@ msgstr ""
 "El propietari dels fitxers sempre ha de tenir permisos de lectura i "
 "escriptura."
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
-msgstr "el camí '%s' no existeix"
+msgstr "el camí «%s» no existeix"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, 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."
+"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, 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."
+msgstr "el dipòsit de referència «%s» no és un dipòsit local."
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència '%s' és superficial"
+msgstr "el dipòsit de referència «%s» és superficial"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència '%s' és empeltat"
-
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, 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 "el dipòsit de referència «%s» és empeltat"
 
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "l'SHA1 %s curt és ambigu"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Els candidats són:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3656,85 +3767,90 @@ msgstr ""
 "suprimiu-les. Desactiveu aquest missatge executant\n"
 "\"git config advice.objectNameWarning false\""
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
 "de fusió"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, 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:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
 
-#: submodule.c:115
+#: submodule.c:138
 #, 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:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "l'allistament del .gitmodules actualitzat ha fallat"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "no es permeten els valors negatius a submodule.fetchJobs"
-
-#: submodule.c:376
-#, fuzzy, c-format
+#: submodule.c:309
+#, c-format
 msgid "in unpopulated submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "al submòdul no populat «%s»"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+msgstr "L'especificació «%s» és en el submòdul '%.*s'"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, 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
+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
 #, c-format
 msgid "'%s' not recognized as a git repository"
-msgstr "'%s' no reconegut com un dipòsit git"
+msgstr "«%s» no reconegut com un dipòsit git"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
-msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut iniciar 'git status' al submòdul «%s»"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
-msgstr "el submòdul '%s' té l'índex brut"
+msgstr "el submòdul «%s» té l'índex brut"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, 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 "
+"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
 "treball"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "no s'ha trobat el nom pel submòdul '%s'"
+msgstr "no s'ha trobat el nom pel submòdul «%s»"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
-msgstr "no s'ha pogut crear el directori '%s'"
+msgstr "no s'ha pogut crear el directori «%s»"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3742,97 +3858,101 @@ msgid ""
 "'%s'\n"
 msgstr ""
 "S'està migrant el directori de '%s%s' des de\n"
-"'%s' a\n"
-"'%s'\n"
+"«%s» a\n"
+"«%s»\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, 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'"
+msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no es permeten els valors negatius a submodule.fetchjobs"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
-msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
+msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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'"
+msgstr "valor desconegut «%s» per a la clau «%s»"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "més d'un %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "testimoni de remolc buit en el remolc '%.*s'"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
-msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "no s'ha pogut llegir des d'stdin"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "no s'ha pogut fer stat a %s"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "el fitxer %s no és un fitxer regular"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "el fitxer %s no és gravable per l'usuari"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "no s'ha pogut obrir el fitxer temporal"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
+msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida '%s'"
+msgstr "transport: opció de profunditat no vàlida «%s»"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3841,7 +3961,7 @@ msgstr ""
 "Els camins de submòdul següents contenen canvis que no\n"
 "es poden trobar en cap remot:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3867,7 +3987,7 @@ msgstr ""
 "\n"
 "per a pujar-los a un remot.\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "S'està avortant."
 
@@ -3888,11 +4008,11 @@ msgstr "mode mal format en entrada d'arbre"
 msgid "empty filename in tree entry"
 msgstr "nom de fitxer buit en una entrada d'arbre"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3900,10 +4020,10 @@ msgid ""
 msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per "
 "agafar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"canviar de branca."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de canviar de "
+"branca."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3913,7 +4033,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3921,10 +4041,9 @@ msgid ""
 msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per "
 "fusionar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"fusionar."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de fusionar."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3934,16 +4053,16 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, 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 ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
+"%%sSi us plau, cometeu els vostres canvis o feu «stash» abans de %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"
@@ -3952,7 +4071,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3961,7 +4080,7 @@ msgstr ""
 "En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3971,7 +4090,7 @@ msgstr ""
 "agafar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3981,7 +4100,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3991,7 +4110,7 @@ msgstr ""
 "fusionar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4001,7 +4120,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4010,7 +4129,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4019,7 +4138,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4030,7 +4149,7 @@ msgstr ""
 "agafar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4041,7 +4160,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4051,7 +4170,7 @@ msgstr ""
 "fusionar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4061,7 +4180,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4071,7 +4190,7 @@ msgstr ""
 "%s:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4081,22 +4200,22 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "L'entrada '%s' encavalca amb '%s'.  No es pot vincular."
+msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"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"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4107,7 +4226,7 @@ msgstr ""
 "actualitzar l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4118,7 +4237,7 @@ msgstr ""
 "l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4127,17 +4246,12 @@ msgstr ""
 "No es pot actualitzar el submòdul:\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "S'està avortant\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "el submòdul'%s' té una estratègia d'actualització no admesa"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "S'estan agafant fitxers"
 
@@ -4173,28 +4287,23 @@ msgstr "segment de camí '..' no vàlid"
 #: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
-msgstr "s'ha produït un error en llegir '%s'"
+msgstr "s'ha produït un error en llegir «%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"
+msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir '%s' per a escriptura"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir '%s' per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
 
 #: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
-msgstr "no s'ha pogut accedir a '%s'"
+msgstr "no s'ha pogut accedir a «%s»"
 
 #: wrapper.c:632
 msgid "unable to get current working directory"
@@ -4210,199 +4319,199 @@ msgstr "no s'ha pogut escriure a %s"
 msgid "could not close %s"
 msgstr "no s'ha pogut tancar %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Camins sense fusionar:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (useu \"git add <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
 "resolució)"
 
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (useu \"git rm <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 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:224
+#: wt-status.c:222
 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:225
+#: wt-status.c:223
 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)"
 
-#: wt-status.c:227
+#: wt-status.c:225
 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)"
 
-#: wt-status.c:239
+#: wt-status.c:237
 #, 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à)"
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "suprimit per ambdós:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "afegit per nosaltres:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "suprimit per ells:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "afegit per ells:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "suprimit per nosaltres:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "afegit per ambdós:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "modificat per ambdós:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "fitxer nou:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "copiat:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "suprimit:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "modificat:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "canviat de nom:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "canviat de tipus:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "desconegut:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "sense fusionar:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "comissions noves, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "contingut modificat, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:821
-#, fuzzy, c-format
+#: wt-status.c:819
+#, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Actualment esteu fent «rebase»."
-msgstr[1] "Actualment esteu fent «rebase»."
+msgstr[0] "L'«stash» té actualment %d entrada"
+msgstr[1] "L'«stash» té actualment %d entrades"
 
-#: wt-status.c:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"No toqueu la línia a dalt.\n"
-"Tot el que hi ha a sota s'eliminarà."
+"No modifiqueu o suprimiu la línia de dalt.\n"
+"Tot el que hi ha a sota s'ignorarà."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregleu els conflictes i executeu \"git commit\")"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (useu \"git merge --abort\" per a avortar la fusió)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (useu \"git commit\" per a concloure la fusió)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregleu els conflictes i després executeu \"git am --continue\")"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (useu \"git am --skip\" per a ometre aquest pedaç)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (useu \"git am --abort\" per a restaurar la branca original)"
 
@@ -4444,7 +4553,7 @@ msgstr "  (useu \"git rebase --edit-todo\" per a veure i editar)"
 #: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu fent «rebase» de la branca '%s' en '%s'."
+msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
 
 #: wt-status.c:1264
 msgid "You are currently rebasing."
@@ -4474,7 +4583,7 @@ 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'."
+"«%s» en «%s»."
 
 #: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
@@ -4491,7 +4600,7 @@ msgstr ""
 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'."
+"«%s» en «%s»."
 
 #: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
@@ -4551,7 +4660,7 @@ msgstr ""
 #: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
+msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
 
 #: wt-status.c:1368
 msgid "You are currently bisecting."
@@ -4590,9 +4699,8 @@ msgid "Initial commit"
 msgstr "Comissió inicial"
 
 #: wt-status.c:1607
-#, fuzzy
 msgid "No commits yet"
-msgstr "no s'ha analitzat cap comissió."
+msgstr "No s'ha fet cap comissió encara."
 
 #: wt-status.c:1621
 msgid "Untracked files"
@@ -4644,13 +4752,13 @@ msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"no hi ha res afegit a cometre però existeixen 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
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
-msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n"
+msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
 
 #: wt-status.c:1658
 #, c-format
@@ -4676,9 +4784,8 @@ 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
-#, fuzzy
 msgid "No commits yet on "
-msgstr "No s'ha fet cap ordre."
+msgstr "No s'ha fet cap comissió encara a "
 
 #: wt-status.c:1784
 msgid "HEAD (no branch)"
@@ -4707,10 +4814,10 @@ msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 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:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
-msgstr "s'ha produït un error en desenllaçar '%s'"
+msgstr "s'ha produït un error en desenllaçar «%s»"
 
 #: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
@@ -4721,121 +4828,120 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
 #: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
-msgstr "elimina '%s'\n"
+msgstr "elimina «%s»\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir '%s' per a escriptura."
+msgstr "No s'ha pogut obrir «%s» per a escriptura."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
-msgstr "No s'ha pogut fer stat a '%s'"
+msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
-msgstr "No s'ha pogut aplicar '%s'"
+msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 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"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "marxa en sec"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "recull interactiu"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "registra només el fet de que el camí s'afegirà més tard"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 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)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 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:285
+#: builtin/add.c:287
 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"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/add.c:288
-#, fuzzy
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
-msgstr "crea un dipòsit nu"
+msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4853,155 +4959,154 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:331
-#, fuzzy, c-format
+#: builtin/add.c:333
+#, c-format
 msgid "adding embedded git repository: %s"
-msgstr "--stdin requereix d'un dipòsit git"
+msgstr "s'està afegint un dipòsit incrustat: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, 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:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A i -u són mútuament incompatibles"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, 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"
+msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Potser volíeu dir 'git add .'?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "fitxer d'índex malmès"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
+msgstr "s'ha suprimit «%s» pel ganxo applypatch-msg"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr "Línia d'entrada mal formada: '%s'."
+msgstr "Línia d'entrada mal formada: «%s»."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "S'ha produït un error en copiar les notes de '%s' a '%s'"
+msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
-msgstr "no s'ha pogut analitzar el pedaç '%s'"
+msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 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:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "desplaçament de zona de temps no vàlid"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr "s'ha produït un error en crear el directori '%s'"
+msgstr "s'ha produït un error en crear el directori «%s»"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "no s'ha pogut escriure el fitxer d'índex"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, 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:1172
+#: builtin/am.c:1194
 #, 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ò."
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, 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"
 "\"."
 
-#: builtin/am.c:1304
-#, fuzzy
+#: builtin/am.c:1302
 msgid "Patch is empty."
-msgstr "El pedaç actual està buit."
+msgstr "El pedaç està buit."
 
-#: builtin/am.c:1370
-#, fuzzy, c-format
+#: builtin/am.c:1368
+#, c-format
 msgid "invalid ident line: %.*s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 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."
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 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:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5009,38 +5114,38 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 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:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: 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:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: 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:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "El cos de la comissió és:"
 
@@ -5048,37 +5153,37 @@ msgstr "El cos de la comissió és:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 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: "
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1870
+#: 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:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5088,7 +5193,7 @@ 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:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5096,17 +5201,17 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
-msgstr "No s'ha pogut analitzar l'objecte '%s'."
+msgstr "No s'ha pogut analitzar l'objecte «%s»."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5114,136 +5219,135 @@ 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:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vàlid per a --patch-format: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 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:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa la bandera -k al git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa la bandera -b al git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa la bandera -m al git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "passa-ho a través del git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr ""
 "passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 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:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "usa el marc de temps actual per la data d'autor"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per al git-rebase)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5251,18 +5355,18 @@ msgstr ""
 "Fa molt que l'opció -b/--binary no ha fet res, i\n"
 "s'eliminarà. Si us plau, no l'useu més."
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "S'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, 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."
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5271,7 +5375,7 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu \"git am --abort\" per a eliminar-lo."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
@@ -5282,7 +5386,7 @@ msgstr "git apply [<opcions>] [<pedaç>...]"
 #: builtin/archive.c:17
 #, c-format
 msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu '%s'"
+msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
 
 #: builtin/archive.c:20
 msgid "could not redirect output"
@@ -5480,134 +5584,161 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opcions>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
-"s'està suprimint la branca '%s' que s'ha\n"
-"         fusionat a '%s', però encara no\n"
+"s'està suprimint la branca «%s» que s'ha\n"
+"         fusionat a «%s», però encara no\n"
 "         s'ha fusionat a HEAD."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
-"no s'està suprimint la branca '%s' que encara no\n"
-"         s'ha fusionat a '%s', encara que està\n"
+"no s'està suprimint la branca «%s» que encara no\n"
+"         s'ha fusionat a «%s», encara que està\n"
 "         fusionada a HEAD."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
-msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
+msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
-"La branca '%s' no està totalment fusionada.\n"
+"La branca «%s» no està totalment fusionada.\n"
 "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "L'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "no es pot usar -a amb -d"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "No es pot suprimir la branca '%s' agafada a '%s'"
+msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
-msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
+msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
-msgstr "no s'ha trobat la branca '%s'."
+msgstr "no s'ha trobat la branca «%s»."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error en suprimir la branca amb seguiment remot '%s'"
+msgstr "Error en suprimir la branca amb seguiment remot «%s»"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
-msgstr "Error en suprimir la branca '%s'"
+msgstr "Error en suprimir la branca «%s»"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca %s (era %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no s'ha pogut analitzar la cadena de format"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "S'està fent «rebase» en la branca %s a %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+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
 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:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
-msgstr "Nom de branca no vàlid: '%s'"
+msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "La còpia de la branca ha fallat"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "S'ha copiat el nom de la branca mal anomenada «%s»"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
-msgstr "S'ha canviat el nom de la branca mal anomenada '%s'"
+msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, 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:506
+#: builtin/branch.c:528
 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"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La branca està copiada, però l'actualització del fitxer de configuració ha "
+"fallat"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5618,234 +5749,230 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb '%c'.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 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:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configura el mode de seguiment (vegeu git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "canvia la informació de font"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "no usar"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "Desestableix la informació de font"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "usa sortida colorada"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "imprimeix només les branques que continguin la comissió"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 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:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copia una branca i el seu registre de referència"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copia una branca, encara que el destí existeixi"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "clau"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:615
-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."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column i --verbose són incompatibles"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 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:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
-msgstr "Encara no hi ha cap comissió en la branca '%s'."
+msgstr "Encara no hi ha cap comissió en la branca «%s»."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
-msgstr "No hi ha branca amb nom '%s'."
+msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "hi ha massa branques per a una operació de canvi de nom"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "hi ha massa branques per a una operació de còpia"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "hi ha massa branques per a establir una nova font"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "hi ha massa arguments per a una operació remota"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "hi ha massa arguments per a establir una nova font"
+
+#: builtin/branch.c:756
 #, 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."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
-msgstr "no hi ha tal branca '%s'"
+msgstr "no hi ha tal branca «%s»"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
-msgstr "la branca '%s' no existeix"
+msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "hi ha massa branques per a desestablir la font"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "hi ha massa arguments per a desestablir la font"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
-msgstr "La branca '%s' no té informació de font"
+msgstr "La branca «%s» no té informació de font"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "no té sentit crear 'HEAD' manualment"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 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"
 
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --"
-"track o --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"\n"
-"Si volíeu fer '%s' seguir '%s', feu això:\n"
-"\n"
+"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
+"upstream-to."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5860,7 +5987,7 @@ 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:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5868,7 +5995,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
 
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5876,66 +6003,66 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 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:566
+#: builtin/cat-file.c:568
 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"
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camí específic per a --textconv/--filters"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 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:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 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"
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 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:579
+#: builtin/cat-file.c:581
 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)"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
@@ -5963,7 +6090,7 @@ msgstr "llegeix els noms de fitxer d'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:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
@@ -6054,9 +6181,9 @@ 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:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "cadena"
 
@@ -6079,103 +6206,103 @@ msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 #: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
-msgstr "el camí '%s' no té la nostra versió"
+msgstr "el camí «%s» no té la nostra versió"
 
 #: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
-msgstr "el camí '%s' no té la seva versió"
+msgstr "el camí «%s» no té la seva versió"
 
 #: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
-msgstr "el camí '%s' no té totes les versions necessàries"
+msgstr "el camí «%s» no té totes les versions necessàries"
 
 #: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
-msgstr "el camí '%s' no té les versions necessàries"
+msgstr "el camí «%s» no té les versions necessàries"
 
 #: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
-msgstr "camí '%s': no es pot fusionar"
+msgstr "camí «%s»: no es pot fusionar"
 
 #: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
-msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'"
+msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
 
 #: 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 es pot usar amb actualització de camins"
+msgstr "«%s» no es pot usar amb actualització de camins"
 
 #: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
-msgstr "'%s' no es pot usar amb %s"
+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."
+"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
 
 #: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
-msgstr "el camí '%s' està sense fusionar"
+msgstr "el camí «%s» està sense fusionar"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
-msgstr "No es pot fer reflog per a '%s': %s\n"
+msgstr "No es pot fer reflog per a «%s»: %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
-msgstr "Restableix la branca '%s'\n"
+msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
-msgstr "Ja en '%s'\n"
+msgstr "Ja en «%s»\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
-msgstr "S'ha canviat i restablert a la branca '%s'\n"
+msgstr "S'ha canviat i restablert a la branca «%s»\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
-msgstr "S'ha canviat a la branca nova '%s'\n"
+msgstr "S'ha canviat a la branca nova «%s»\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
-msgstr "S'ha canviat a la branca '%s'\n"
+msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6198,7 +6325,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6213,172 +6340,172 @@ msgid_plural ""
 " git branch <new-branch-name> %s\n"
 "\n"
 msgstr[0] ""
-"Si la voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si la voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
 "per a fer-ho amb:\n"
 "\n"
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 msgstr[1] ""
-"Si les voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si les voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
 "per a fer-ho amb:\n"
 "\n"
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' no es pot usar amb canvi de branca"
+msgstr "«%s» no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' no es pot usar amb '%s'"
+msgstr "«%s» no es pot usar amb «%s»"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "No es pot canviar la branca a la no comissió '%s'"
+msgstr "No es pot canviar la branca a la no comissió «%s»"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "estableix la informació de font de la branca nova"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "estil de conflicte (fusió o diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "dubta 'git checkout <cap-branca-així>'"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "força l'informe de progrés"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B i --orphan són mutualment exclusius"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Manca el nom de branca; proveu -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, 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'"
+msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6417,7 +6544,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:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6430,7 +6557,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6451,38 +6578,38 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 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:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, 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:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Adéu.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6500,63 +6627,63 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Ordres ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "I ara què"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 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:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6564,7 +6691,7 @@ msgstr ""
 "clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han "
 "indicat; refusant netejar"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6572,142 +6699,142 @@ msgstr ""
 "clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "crea un dipòsit nu"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "crea un dipòsit mirall (implica bare)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "per a clonar des d'un dipòsit local"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "no usis enllaços durs locals, sempre copia"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "configura com a dipòsit compartit"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "especificació de camí"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "inicialitza els submòduls en el clon"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 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:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "dipòsit de referència"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "agafa <branca> en lloc del HEAD del remot"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "profunditat"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una hora específica"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "revisió"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 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:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "clau=valor"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "estableix la configuració dins del dipòsit nou"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6715,42 +6842,42 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Si us plau, especifiqueu un directori en la línia d'ordres"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, 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"
+msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
-msgstr "s'ha produït un error en obrir '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "s'ha produït un error en fer stat a '%s'\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
-msgstr "s'ha produït un error en crear l'enllaç '%s'"
+msgstr "s'ha produït un error en crear l'enllaç «%s»"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
-msgstr "s'ha produït un error en copiar el fitxer a '%s'"
+msgstr "s'ha produït un error en copiar el fitxer a «%s»"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6761,101 +6888,101 @@ msgstr ""
 "'git status' i tornar a intentar l'agafament amb\n"
 "'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:559
+#: builtin/clone.c:560
 #, 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:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 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"
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Hi ha massa paràmetres."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un dipòsit per a clonar."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les opcions --bare i --origin %s són incompatibles."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir són incompatibles."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
-msgstr "el dipòsit '%s' no existeix"
+msgstr "el dipòsit «%s» no existeix"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profunditat %s no és nombre positiu"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, 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."
+msgstr "el camí destí «%s» ja existeix i no és un directori buit."
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
-msgstr "l'arbre de treball '%s' ja existeix."
+msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
-msgstr "no s'han pogut crear els directoris inicials de '%s'"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
-msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
+msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "S'està clonant al dipòsit nu '%s'...\n"
+msgstr "S'està clonant al dipòsit nu «%s»...\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
-msgstr "S'està clonant a '%s'...\n"
+msgstr "S'està clonant a «%s»...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6863,39 +6990,39 @@ msgstr ""
 "clone --recursive no és compatible amb ambdós --reference i --reference-if-"
 "able"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 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:1069
+#: builtin/clone.c:1073
 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ò."
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 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ò."
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "el dipòsit font és superficial, s'està ignorant --local"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "No se sap com clonar %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, 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:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembla que heu clonat un dipòsit buit."
 
@@ -7037,61 +7164,61 @@ msgstr ""
 "Llavors \"git cherry-pick --continue\" reprendrà\n"
 "com a «cherry pick» les comissions restants.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 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:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 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:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
-msgstr "a la comissió '%s' li manca la capçalera d'autor"
+msgstr "a la comissió «%s» li manca la capçalera d'autor"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
-msgstr "la comissió '%s' té una línia d'autor mal formada"
+msgstr "la comissió «%s» té una línia d'autor mal formada"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7099,38 +7226,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:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 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:707
+#: builtin/commit.c:711
 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:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7145,7 +7272,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7160,7 +7287,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7170,7 +7297,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:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7178,152 +7305,152 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 "Si us plau, introduïu el missatge de comissió dels vostres canvis.\n"
-"Es retindran les línies començants 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:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Error en construir arbres"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n"
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
-"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
+"--author «%s» no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
 "cap autor existent"
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "Mode de fitxers no seguits no vàlid '%s'"
+msgstr "Mode de fitxers no seguits no vàlid «%s»"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long i -z són incompatibles"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 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:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 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:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 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:1180
+#: 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:1188
+#: builtin/commit.c:1195
 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:1205
+#: builtin/commit.c:1212
 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:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "-a no té sentit amb camins."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1346
-#, fuzzy
+#: builtin/commit.c:1353
 msgid "show stash information"
-msgstr "mostra la informació de branca"
+msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "sortida llegible per màquina"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 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)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "mostra els fitxers ignorats"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7331,202 +7458,203 @@ msgstr ""
 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1440
+#: 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:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissió novament creada"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (comissió d'arrel)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "mostra la diferència en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "autor corregit de la comissió"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "data corregida de la comissió"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "missatge de comissió"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "comissió"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissió especificada"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissió especificada"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usa el missatge formatat de «squash» automàtic per a corregir la comissió "
 "especificada"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 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"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "afegeix Signed-off-by:"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "per defecte"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Opcions dels continguts de les comissions"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'índex per a cometre"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els ganxos de precomissió i missatge de comissió"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "evita el ganxo de post escriptura"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "està bé registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "no s'ha pogut analitzar la comissió HEAD"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1756
 #, 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:1800
+#: builtin/commit.c:1761
+#, 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
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7628,7 +7756,7 @@ msgstr "troba el color configurat: ranura [per defecte]"
 
 #: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
+msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
 
 #: builtin/config.c:78
 msgid "Type"
@@ -7692,16 +7820,15 @@ msgstr ""
 "#\temail = %s\n"
 
 #: builtin/config.c:499
-#, fuzzy
 msgid "--local can only be used inside a git repository"
-msgstr "--cached fora d'un dipòsit"
+msgstr "--local només es pot usar dins d'un dipòsit git"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
-msgstr "no es pot crear el fitxer de configuració '%s'"
+msgstr "no es pot crear el fitxer de configuració %s"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7710,11 +7837,11 @@ msgstr ""
 "no es pot sobreescriure múltiples valors amb un sol valor\n"
 "       Useu una expressió regular, --add o --replace-all per a canviar %s."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
@@ -7738,70 +7865,70 @@ msgstr "lleuger"
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no és disponible"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'etiqueta anotada %s no té nom incrustat"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
-msgstr "l'etiqueta '%s' realment és '%s' aquí"
+msgstr "l'etiqueta «%s» realment és «%s» aquí"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: 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:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de '%s' vàlid"
+msgstr "%s no és un objecte de «%s» vàlid"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
-msgstr "cap etiqueta coincideix exactament amb '%s'"
+msgstr "cap etiqueta coincideix exactament amb «%s»"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "s'està cercant per a descriure %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
-"Cap etiqueta anotada pot descriure '%s'.\n"
+"Cap etiqueta anotada pot descriure «%s».\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
-"Cap etiqueta pot descriure '%s'.\n"
+"Cap etiqueta pot descriure «%s».\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7810,203 +7937,203 @@ 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:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui després de la comissió"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "estratègia de cerca de depuració en stderr"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "usa qualsevol referència"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "només segueix la primera mare"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "emet només coincidències exactes"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "només considera les etiquetes que coincideixen amb <patró>"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 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:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long és incompatible amb --abbrev=0"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty és incompatible amb les comissions"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken és incompatible amb les comissions"
 
 #: builtin/diff.c:83
 #, c-format
 msgid "'%s': not a regular file or symlink"
-msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
+msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
 
 #: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "opció no vàlida: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "No és un dipòsit de git"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
-msgstr "s'ha donat un objecte no vàlid '%s'."
+msgstr "s'ha donat un objecte no vàlid «%s»."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
-msgstr "s'ha donat més de dos blobs: '%s"
+msgstr "s'ha donat més de dos blobs: «%s»"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
-msgstr "s'ha donat l'objecte no gestionat '%s'."
+msgstr "s'ha donat l'objecte no gestionat «%s»."
 
 #: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
-msgstr "s'han modificat ambdós fitxers: '%s' i '%s'."
+msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a %s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<tool>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 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`"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<command>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "especifiqueu una ordre personalitzada per veure diffs"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
 
@@ -8014,232 +8141,232 @@ msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opcions-de-llista-de-revisions]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "mostra el progrés després de <n> objectes"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "Importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Imprimeix l'arbre complet de cada comissió"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "Usa la característica done per a acabar el corrent"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Omet l'emissió de dades de blob"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en temps"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "converteix en un dipòsit complet"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "directori"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "mostra el mapa de referències d'obtenció"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "No s'ha pogut trobar la referència HEAD remota"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, 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:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, 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"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8249,55 +8376,55 @@ msgstr ""
 " intenteu executar 'git remote prune %s' per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, 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:997
+#: builtin/fetch.c:1019
 #, 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:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "S'ignora l'opció \"%s\" per a %s\n"
 
-#: builtin/fetch.c:1076
+#: 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:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8305,40 +8432,40 @@ msgstr ""
 "Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n"
 "un nom remot del qual es deuen obtenir les revisions noves."
 
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Necessiteu especificar un nom d'etiqueta."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "No s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen i --depth són mutualment exclusius"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth i --unshallow no es poden usar junts"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un dipòsit complet no té sentit"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un paràmetre de dipòsit"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No hi ha tal remot ni tal grup remot: %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Obtenir un grup i especificar referències no té sentit"
 
@@ -8348,23 +8475,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 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:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
@@ -8406,101 +8533,105 @@ 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:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecta els colors del format"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "imprimeix només les referències que assenyalin l'objecte donat"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "imprimeix només les referències que s'han fusionat"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "imprimeix només les referències que no s'han fusionat"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "imprimeix només les referències que continguin la comissió"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 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:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "fes els objectes d'índex nodes de cap"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<opcions>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "S'ha produït un error en fer fstat %s: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "No es pot fer stat en %s"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8515,52 +8646,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referència"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 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:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, 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"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, 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:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu \"git help gc\" per neteja manual.\n"
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, 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)"
+"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
 
-#: builtin/gc.c:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8571,12 +8702,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, 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"
@@ -8585,254 +8716,245 @@ 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:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hi ha suport de fils, s'està ignorant %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, 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:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció `%c' espera un valor numèric"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 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:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "anteposa això a la sortida del nom base del projecte pare"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "coincidència insensible a majúscula i minúscula"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX esteses"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 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:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 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:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 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"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 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:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "drecera per -C NUM"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 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:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 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"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "cap patró donat."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1250
-#, fuzzy
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
-msgstr "no hi ha suport de fils, s'està ignorant %s"
+msgstr "no hi ha suport de fils, s'està ignorant --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 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:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "opció no admesa amb --recurse-submodules."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached o --untracked no es pot usar amb --no-index."
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 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:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "s'han donat ambdós --caches i arbres."
 
@@ -8910,7 +9032,7 @@ msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
 #: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
-msgstr "format d'ajuda no reconegut '%s'"
+msgstr "format d'ajuda no reconegut «%s»"
 
 #: builtin/help.c:94
 msgid "Failed to start emacsclient."
@@ -8923,185 +9045,185 @@ msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
 #: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
-msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
+msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
-msgstr "s'ha produït un error en executar '%s'"
+msgstr "s'ha produït un error en executar «%s»"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
-"'%s': camí a un visualitzador de manuals no compatible.\n"
+"«%s»: camí a un visualitzador de manuals no compatible.\n"
 "Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
-"'%s': ordre per a un visualitzador de manuals compatible.\n"
+"«%s»: ordre per a un visualitzador de manuals compatible.\n"
 "Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
-msgstr "'%s': visualitzador de manuals desconegut."
+msgstr "«%s»: visualitzador de manuals desconegut."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "La definició d'atributs per camí"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Git quotidià amb més o menys 20 ordres"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Un glossari de Git"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "La definició de les propietats de submòduls"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificació de revisions i rangs per al Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "Les guies de Git comunes són:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' és un àlies de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» és un àlies de «%s»"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "hi ha una discordança de tipus d'objecte a %s"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objecte %s: tipus %s esperat, %s trobat"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, 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:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "s'han usat més octets que hi havia disponibles"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear '%s'"
+msgstr "no s'ha pogut crear «%s»"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet '%s'"
+msgstr "no es pot obrir el fitxer de paquet «%s»"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "la inflació ha retornat %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr ""
 "desbordament de valor de desplaçament per a l'objecte base de diferències"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 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:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipus d'objecte desconegut %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "no es pot fer pread en el fitxer de paquet"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -9109,224 +9231,224 @@ 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"
 
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no es pot llegir la informació d'objecte existent %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no es pot llegir l'objecte existent %s"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Error en objecte"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "S'estan rebent objectes"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "S'estan indexant objectes"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "el paquet és malmès (discordança SHA1)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "no es pot fer fstat en el fitxer de paquet"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "el paquet té brossa al seu final"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferències"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "confusió més enllà de la bogeria"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "s'ha completat amb %d objecte local"
 msgstr[1] "s'ha completat amb %d objectes locals"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "El paquet té %d diferència no resolta"
 msgstr[1] "El paquet té %d diferències no resoltes"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "error en tancar el fitxer de paquet"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
-msgstr "no es pot escriure el fitxer a retenir '%s'"
+msgstr "no es pot escriure el fitxer a mantenir «%s»"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
-msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
+msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "no es pot emmagatzemar el fitxer de paquet"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> dolent"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent '%s'"
+msgstr "No es pot obrir el fitxer de paquet existent «%s»"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, 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'"
+msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: 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'"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "%s dolent"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no es pot usar sense --stdin"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin requereix d'un dipòsit git"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
 #: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
-msgstr "no es pot fer stat en '%s'"
+msgstr "no es pot fer stat en «%s»"
 
 #: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
-msgstr "no es pot fer stat en la plantilla '%s'"
+msgstr "no es pot fer stat en la plantilla «%s»"
 
 #: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
-msgstr "no es pot fer opendir en el directori '%s'"
+msgstr "no es pot fer opendir en el directori «%s»"
 
 #: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
-msgstr "no es pot fer readlink en '%s'"
+msgstr "no es pot fer readlink en «%s»"
 
 #: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
-msgstr "no es pot fer symlink en '%s' '%s'"
+msgstr "no es pot fer symlink en «%s» «%s»"
 
 #: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
-msgstr "no es pot copiar '%s' a '%s'"
+msgstr "no es pot copiar «%s» a «%s»"
 
 #: builtin/init-db.c:89
 #, c-format
@@ -9341,7 +9463,7 @@ msgstr "no s'han trobat les plantilles %s"
 #: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
-msgstr "no s'està copiant plantilles de '%s': %s"
+msgstr "no s'està copiant plantilles de «%s»: %s"
 
 #: builtin/init-db.c:328
 #, c-format
@@ -9416,7 +9538,7 @@ msgstr ""
 #: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
-msgstr "No es pot accedir a l'arbre de treball '%s'"
+msgstr "No es pot accedir a l'arbre de treball «%s»"
 
 #: builtin/interpret-trailers.c:15
 msgid ""
@@ -9426,132 +9548,168 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "edita els fitxers in situ"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "escurça els remolcs buits"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+#, fuzzy
+msgid "action if trailer already exists"
+msgstr "l'arbre de treball '%s' ja existeix."
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+#, fuzzy
+msgid "output only the trailers"
+msgstr "escurça els remolcs buits"
+
+#: builtin/interpret-trailers.c:103
+#, fuzzy
+msgid "do not apply config rules"
+msgstr "cerca les variables de configuració"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "estableix les opcions d'anàlisis"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "remolc"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "remolcs a afegir"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+#, fuzzy
+msgid "--trailer with --only-input does not make sense"
+msgstr "--name-only no té sentit"
+
+#: builtin/interpret-trailers.c:127
 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:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opció --decorate no vàlida: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "Usa el fitxer de mapa de correu"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "opcions de decoració"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 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:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer dolent"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "No es pot llegir l'objecte %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipus desconegut: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "el nom del directori de sortida és massa llarg"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No es pot obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Cal exactament un rang."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "No és un rang."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "La carta de presentació necessita el format de correu electrònic"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Hi ha dos directoris de sortida?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Comissió desconeguda %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, 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."
+msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "No s'ha pogut trobar la base exacta de fusió."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9563,220 +9721,228 @@ msgstr ""
 "seguir una branca remota. O podeu especificar la comissió base manualment\n"
 "amb --base=<id-de-comissió-base>."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "S'ha produït un error en trobar la base exacta de fusió."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 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:1319
+#: builtin/log.c:1323
 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:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 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:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 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:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de '.patch'"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 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:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefix>] en lloc de [PATCH]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 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:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 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)"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 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:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "ajunta el pedaç"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 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:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "mostra el progrés durant la generació de pedaços"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n i -k són mutualment exclusius."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "sortida estàndard o directori, quin dels dos?"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
-msgstr "No s'ha pogut crear el directori '%s'"
+msgstr "No s'ha pogut crear el directori «%s»"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
+msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
+
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "S'ha produït un error en crear els fitxers de sortida"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9784,105 +9950,105 @@ msgstr ""
 "No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
 "<font> manualment.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr ""
 "mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 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:534
+#: builtin/ls-files.c:532
 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:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "mostra només els noms dels directoris 'other'"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "mostra en la sortida els fitxers sense fusionar"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 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:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 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:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 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"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
@@ -9973,181 +10139,186 @@ msgstr ""
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
-msgstr ""
+msgstr "mbox buit: «%s»"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "l'opció `m' requereix un valor"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
-msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n"
+msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 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:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 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ó"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "estratègia"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 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:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+#, fuzzy
+msgid "verify commit-msg hook"
+msgstr "evita els ganxos de precomissió i missatge de comissió"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
-msgstr "no s'ha pogut executar stash."
+msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
-msgstr "l'emmagatzemament ha fallat"
+msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (res a fer «squash»)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
-msgstr "'%s' no assenyala una comissió"
+msgstr "«%s» no assenyala una comissió"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 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:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opció desconeguda de merge-recursive: -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
-msgstr "No s'ha pogut llegir de '%s'"
+msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, 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"
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10163,70 +10334,70 @@ msgstr ""
 "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
 "avorta la comissió.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, 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"
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 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:898
+#: builtin/merge.c:919
 #, 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:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
-msgstr "Valor dolent '%s' en l'entorn '%s'"
+msgstr "Valor dolent «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort no accepta paràmetres"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue no accepta paràmetres"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10234,7 +10405,7 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Si us plau, cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10242,114 +10413,114 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Si us plau, cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 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:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hi ha una comissió especificada i merge.defaultToUpstream no està "
 "establert."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 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:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 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:1268
+#: builtin/merge.c:1295
 #, 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:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s."
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissió %s no té signatura GPG."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, 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:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Ja està al dia."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, 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:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Ja està al dia. Estupend!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "No és possible avançar ràpidament, s'està avortant."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, 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:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10445,7 +10616,7 @@ msgstr "opció desconeguda %s"
 #: builtin/merge-recursive.c:51
 #, c-format
 msgid "could not parse object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte '%s'"
+msgstr "no s'ha pogut analitzar l'objecte «%s»"
 
 #: builtin/merge-recursive.c:55
 #, c-format
@@ -10461,7 +10632,7 @@ msgstr "no s'està gestionant res a part de la fusió de dos caps."
 #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
 #, c-format
 msgid "could not resolve ref '%s'"
-msgstr "no s'ha pogut resoldre la referència '%s'"
+msgstr "no s'ha pogut resoldre la referència «%s»"
 
 #: builtin/merge-recursive.c:77
 #, c-format
@@ -10493,10 +10664,10 @@ msgstr "git mv [<opcions>] <font>... <destí>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels "
+"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stash» dels "
 "mateixos per a procedir"
 
 #: builtin/mv.c:103
@@ -10512,71 +10683,71 @@ msgstr "força el moviment / canvi de nom encara que el destí existeixi"
 msgid "skip move/rename errors"
 msgstr "omet els errors de moviment / canvi de nom"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
-msgstr "el destí '%s' no és un directori"
+msgstr "el destí «%s» no és un directori"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
-msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n"
+msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "font dolenta"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "no es pot moure un directori a dins d'ell mateix"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "el directori font està buit"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
-msgstr "s'està sobreescrivint '%s'"
+msgstr "s'està sobreescrivint «%s»"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "múltiples fonts per al mateix destí"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
-msgstr "el canvi del nom de '%s' ha fallat"
+msgstr "el canvi del nom de «%s» ha fallat"
 
 #: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
@@ -10742,7 +10913,7 @@ msgstr "Escriviu/editeu les notes per l'objecte següent:"
 #: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
-msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'"
+msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»"
 
 #: builtin/notes.c:152
 msgid "could not read 'show' output"
@@ -10751,7 +10922,7 @@ msgstr "no s'ha pogut llegir la sortida de 'show'"
 #: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
-msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte '%s'"
+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"
@@ -10768,87 +10939,87 @@ 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:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
-msgstr "no es pot llegir '%s'"
+msgstr "no es pot llegir «%s»"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
-msgstr "no s'ha pogut obrir o llegir '%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:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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."
+msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
 
 #: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
-msgstr "s'ha produït un error en llegir l'objecte '%s'."
+msgstr "s'ha produït un error en llegir l'objecte «%s»."
 
 #: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
-msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'."
+msgstr "no es pot llegir les dades de node de l'objecte no de blob «%s»."
 
 #: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
-msgstr "línia d'entrada mal formada: '%s'."
+msgstr "línia d'entrada mal formada: «%s»."
 
 #: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
-msgstr "s'ha produït un error en copiar les notes de '%s' a '%s'"
+msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "no s'ha trobat cap nota per a l'objecte %s."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "anota els continguts com a cadena"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "anota els continguts en un fitxer"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "reusa i edita l'objecte de nota especificat"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "reusa l'objecte de nota especificat"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "permet l'emmagatzematge d'una nota buida"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "reemplaça les notes existents"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10857,30 +11028,30 @@ msgstr ""
 "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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "S'està eliminant la nota de l'objecte %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "llegeix els objectes des d'stdin"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "hi ha massa pocs paràmetres"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10889,12 +11060,12 @@ msgstr ""
 "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:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "manquen notes a l'objecte font %s. No es pot copiar."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10903,53 +11074,53 @@ msgstr ""
 "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
 "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: 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'"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "s'ha produït un error en finalitzar la fusió de notes"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estratègia de fusió de notes desconeguda %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Opcions generals"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Opcions de fusió"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10957,48 +11128,48 @@ msgstr ""
 "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
 "union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "S'estan cometent les notes sense fusionar"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "S'està avortant la resolució de fusió de notes"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "avorta la fusió de notes"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "no es pot combinar --commit, --abort i -s/--strategy"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "cal especificar una referència de notes a fusionar"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconeguda: %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "una fusió de notes a %s ja està en curs a %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, 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)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11009,236 +11180,236 @@ msgstr ""
 "cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
 "'git notes merge --abort'.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objecte %s no té cap nota\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "l'intent d'eliminar una nota no existent no és un error"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "informa de notes podades"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "referència de notes"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
 "<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 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>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflació (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 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"
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 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"
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "S'estan comprimint objectes"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
-msgstr "versió d'índex dolenta '%s'"
+msgstr "versió d'índex dolenta «%s»"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "no mostris l'indicador de progrés"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "mostra l'indicador de progrés"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 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:2884
+#: builtin/pack-objects.c:2890
 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:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "versió[,desplaçament]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 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"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer de paquet de sortida"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 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"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 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"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 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:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 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:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr ""
 "inclou els objectes als quals facin referència les entrades del registre de "
 "referències"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 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"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables més nous que <hora>"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 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"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
@@ -11254,11 +11425,11 @@ msgstr "empaqueta-ho tot"
 msgid "prune loose refs (default)"
 msgstr "poda les referències soltes (per defecte)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "S'estan eliminant objectes duplicats"
 
@@ -11288,7 +11459,6 @@ msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
 #: builtin/pull.c:124
-#, fuzzy
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
@@ -11300,13 +11470,14 @@ msgstr "Opcions relacionades amb fusionar"
 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:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
 #: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
-msgstr "automàticament emmagatzema/desempila 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
 msgid "Options related to fetching"
@@ -11321,7 +11492,7 @@ msgstr "nombre de submòduls baixats en paral·lel"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vàlid per a pull.ff: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11329,13 +11500,13 @@ msgstr ""
 "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
 "acabeu d'obtenir."
 
-#: builtin/pull.c:401
+#: 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:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11343,96 +11514,96 @@ 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:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 "a branch. Because this is not the default configured remote\n"
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
-"Heu demanat baixar del remot '%s', però no heu especificat cap branca.\n"
+"Heu demanat baixar del remot «%s», però no heu especificat cap branca.\n"
 "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:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
-msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
+msgstr "Si us plau, especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per detalls."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 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:434 git-parse-remote.sh:95
+#: 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:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
-"La vostra configuració especifica fusionar amb la referència '%s'\n"
+"La vostra configuració especifica fusionar amb la referència «%s»\n"
 "del remot, però no s'ha obtingut tal referència."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 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."
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "si us plau, cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 "fast-forwarding your working tree from\n"
 "commit %s."
 msgstr ""
-"l'obtenció ha actualitzat el cap de la branca actual.\n"
+"l'obtenció ha actualitzat HEAD de la branca actual.\n"
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11450,15 +11621,15 @@ msgstr ""
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -11549,8 +11720,8 @@ msgid ""
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
 msgstr ""
-"Esteu pujant al remot '%s', que no és la font de la vostra\n"
-"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
+"Esteu pujant al remot «%s», que no és la font de la vostra\n"
+"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
 #: builtin/push.c:246
@@ -11624,12 +11795,12 @@ msgstr "S'està pujant a %s\n"
 #: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
-msgstr "s'ha produït un error en pujar algunes referències a '%s'"
+msgstr "s'ha produït un error en pujar algunes referències a «%s»"
 
 #: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
-msgstr "dipòsit dolent '%s'"
+msgstr "dipòsit dolent «%s»"
 
 #: builtin/push.c:371
 msgid ""
@@ -11840,19 +12011,48 @@ msgstr "depura unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<opcions>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "mantén les comissions buides"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "continua el «rebase»"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "avorta el «rebase»"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+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:32
+msgid "expand SHA-1s in the todo list"
+msgstr "expandeix els SHA-1 en la llista per a fer"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "comprova la llista a fer"
+
+#: builtin/rebase--helper.c:36
+#, fuzzy
+msgid "skip unnecessary picks"
+msgstr "No s'ha pogut ometre ordres innecessaris d'elecció"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11879,11 +12079,11 @@ msgstr ""
 "recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
 "alguna altra manera per a coincidir amb el que hàgiu pujat.\n"
 "\n"
-"Per a silenciar aquest missatge i encara retenir el comportament\n"
+"Per a silenciar aquest missatge i mantenir el el comportament\n"
 "predeterminat, establiu la variable de configuració\n"
 "'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -11905,23 +12105,23 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 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"
+msgstr "«%s» per a «%s» no és una marca de temps vàlida"
 
 #: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
-msgstr "'%s' no és una marca de temps vàlida"
+msgstr "«%s» no és una marca de temps vàlida"
 
 #: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
@@ -12061,20 +12261,20 @@ 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ó"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "el remot %s ja existeix."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
-msgstr "'%s' no és un nom de remot vàlid"
+msgstr "«%s» no és un nom de remot vàlid"
 
 #: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
-msgstr "No s'ha pogut configurar la mestra '%s'"
+msgstr "No s'ha pogut configurar la mestra «%s»"
 
 #: builtin/remote.c:337
 #, c-format
@@ -12090,17 +12290,17 @@ msgstr "(coincident)"
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "No hi ha tal remot: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
-msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'"
+msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12112,17 +12312,17 @@ msgstr ""
 "\t%s\n"
 "\tSi us plau, actualitzeu la configuració manualment si és necessari."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
-msgstr "la supressió de '%s' ha fallat"
+msgstr "la supressió de «%s» ha fallat"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
-msgstr "la creació de '%s' ha fallat"
+msgstr "la creació de «%s» ha fallat"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12137,113 +12337,113 @@ msgstr[1] ""
 "eliminat;\n"
 "per a suprimir-les, useu:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
-msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
+msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " estancat (useu 'git remote prune' per a eliminar)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa «rebase» sobre el remot %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "avanç ràpid possible"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força a %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força a %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenció: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(sense URL)"
 
@@ -12251,187 +12451,187 @@ msgstr "(sense URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1170
+#: 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"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branca local configurada per a 'git pull':"
 msgstr[1] "  Branques locals configurades per a 'git pull':"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  'git push' reflectirà les referències locals"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referència local configurada per a 'git push'%s:"
 msgstr[1] "  Referències locals configurades per a 'git push'%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "suprimeix refs/remotes/<name>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar el HEAD remot"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
 "amb:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No és una referència vàlida: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarà penjant!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "S'està podant %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "poda els remots després d'obtenir-los"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
-msgstr "No hi ha tal remot '%s'"
+msgstr "No hi ha tal remot «%s»"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
-msgstr "cap URL configurat per al remot '%s'"
+msgstr "cap URL configurat per al remot «%s»"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "suprimeix URLs"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no té sentit"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patró d'URL antic no vàlid: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subordre desconeguda: %s"
@@ -12509,9 +12709,8 @@ msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
 #: builtin/repack.c:196
-#, fuzzy
 msgid "limits the maximum number of threads"
-msgstr "limita la profunditat màxima de les diferències"
+msgstr "limita el nombre màxim de fils"
 
 #: builtin/repack.c:198
 msgid "maximum size of each packfile"
@@ -12529,10 +12728,10 @@ msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A són incompatibles"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
-msgstr "s'ha produït un error en eliminar '%s'"
+msgstr "s'ha produït un error en eliminar «%s»"
 
 #: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
@@ -12557,17 +12756,17 @@ msgstr "git replace [--format=<format>] [-l [<patró>]]"
 #: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
-msgstr "No és un nom d'objecte vàlid: '%s'"
+msgstr "No és un nom d'objecte vàlid: «%s»"
 
 #: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
-msgstr "etiqueta de fusió dolenta en la comissió '%s'"
+msgstr "etiqueta de fusió dolenta en la comissió «%s»"
 
 #: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
-msgstr "etiqueta de fusió mal formada en la comissió '%s'"
+msgstr "etiqueta de fusió mal formada en la comissió «%s»"
 
 #: builtin/replace.c:374
 #, c-format
@@ -12575,13 +12774,13 @@ msgid ""
 "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; "
+"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
 msgid "the original commit '%s' has a gpg signature."
-msgstr "la comissió original '%s' té una signatura gpg."
+msgstr "la comissió original «%s» té una signatura gpg."
 
 #: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
@@ -12590,7 +12789,7 @@ msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
 #: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
-msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'"
+msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
 
 #: builtin/replace.c:438
 msgid "list replace refs"
@@ -12662,121 +12861,121 @@ msgstr "fusió"
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "S'ha produït un error en cercar l'arbre de %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, 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:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr "registra només el fet de que els camins eliminats s'afegiran després"
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, 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."
+msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, 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."
+msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch és incompatible amb --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 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ò."
 
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, 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:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N només es pot usar amb --mixed"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, 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'."
+msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "retén el `--` passat com a paràmetre"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12868,11 +13067,11 @@ msgstr "permet les comissions amb missatges buits"
 msgid "keep redundant, empty commits"
 msgstr "retén les comissions redundants i buides"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "la reversió ha fallat"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "el «cherry pick» ha fallat"
 
@@ -12914,7 +13113,7 @@ msgid ""
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 "\n"
-"(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)"
+"(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
 
 #: builtin/rm.c:225
 msgid "the following file has local modifications:"
@@ -12942,20 +13141,20 @@ msgstr "permet l'eliminació recursiva"
 msgid "exit with a zero status even if nothing matched"
 msgstr "surt amb estat zero encara que res hagi coincidit"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
-msgstr "no s'està eliminant '%s' recursivament sense -r"
+msgstr "no s'està eliminant «%s» recursivament sense -r"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no s'ha pogut eliminar %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
 
 #: builtin/send-pack.c:19
 msgid ""
@@ -12989,28 +13188,28 @@ msgstr "imprimeix l'estat des de l'ajudant remot"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr ""
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "ordena la sortida segons el nombre de comissions per autor"
 
-#: builtin/shortlog.c:253
+#: 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"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Mostra l'adreça de correu electrònic de cada autor"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Ajusta les línies de la sortida"
 
@@ -13064,7 +13263,7 @@ msgstr "sinònim de more=-1"
 
 #: builtin/show-branch.c:635
 msgid "suppress naming strings"
-msgstr "omet l'anomenar cadenes"
+msgstr "omet anomenar cadenes"
 
 #: builtin/show-branch.c:637
 msgid "include the current branch"
@@ -13142,7 +13341,7 @@ msgstr[1] "no es poden gestionar més de %d revisions."
 #: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
-msgstr "'%s' no és una referència vàlida."
+msgstr "«%s» no és una referència vàlida."
 
 #: builtin/show-branch.c:815
 #, c-format
@@ -13212,118 +13411,118 @@ msgstr ""
 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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, 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:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
-msgstr "no es pot despullar un component de l'url '%s'"
+msgstr "no es pot despullar un component de l'url «%s»"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, 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"
+msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, 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'"
+msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, 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"
+msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, 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"
+"«%s»\n"
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, 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'"
+"submòdul «%s»"
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "Omet la sortida d'inicialitzar un submòdul"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<camí>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, 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'"
+msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
-msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
+msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr "No es reconeix el valor '%s' per a submodule.alternateErrorStrategy"
+msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation"
+msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submòdul"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "força el progrés del clonatge"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13331,82 +13530,82 @@ msgstr ""
 "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
 "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
+msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
-msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
+msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
-msgstr "El camí de submòdul '%s' no està inicialitzat"
+msgstr "El camí de submòdul «%s» no està inicialitzat"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar 'update --init'?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'està ometent el submòdul no fusionat %s"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
-msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent"
+msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, 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"
+msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "camí a l'arbre de treball"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 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:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 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:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 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:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "valor dolent per al paràmetre update"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13415,23 +13614,23 @@ msgstr ""
 "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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir  [<camí>]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' no és una subordre vàlida de submodule--helper"
+msgstr "«%s» no és una subordre vàlida de submodule--helper"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -13441,23 +13640,23 @@ msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "omet el missatge d'error de referències no simbòliques (separades)"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "suprimeix la referència simbòlica"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "escurça la sortida de referències"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "raó"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "raó de l'actualització"
 
@@ -13487,17 +13686,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
-msgstr "no s'ha trobat l'etiqueta '%s'."
+msgstr "no s'ha trobat l'etiqueta «%s»."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
-msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
+msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13510,7 +13709,7 @@ msgstr ""
 "  %s\n"
 "Les línies que comencin amb '%c' s'ignoraran.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13525,145 +13724,145 @@ msgstr ""
 "Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
 "mateix si voleu.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "no s'ha pogut signar l'etiqueta"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "el tipus d'objecte és dolent."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, 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:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column i -n són incompatibles"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "es permet l'opció -n només amb mode llista"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "es permet l'opció --contains només amb mode llista"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 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:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "es permet --points-at option només amb mode llista"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 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:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "només es permet una opció -F o -m."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "massa paràmetres"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
-msgstr "'%s' no és un nom d'etiqueta vàlid."
+msgstr "«%s» no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
-msgstr "l'etiqueta '%s' ja existeix"
+msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
-msgstr "Etiqueta '%s' actualitzada (era %s)\n"
+msgstr "Etiqueta «%s» actualitzada (era %s)\n"
 
 #: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
@@ -13697,7 +13896,7 @@ msgstr "s'ha produït un error en suprimir el directori %s"
 #: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr "S'està provant mtime en '%s' "
+msgstr "S'està provant mtime en «%s» "
 
 #: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
@@ -13734,132 +13933,132 @@ msgstr ""
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr "com --refresh, però ignora l'ajust assume-unchanged"
+msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a \"no canviant\""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "neteja el bit assumed-unchanged"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a \"només índex\""
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "neteja el bit skip-worktree"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 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"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "elimina els camins anomenats encara que estiguin presents en l'arbre de "
 "treball"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 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:975
+#: builtin/update-index.c:977
 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:979
+#: builtin/update-index.c:981
 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:983
+#: builtin/update-index.c:985
 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:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 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:1008
+#: builtin/update-index.c:1010
 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:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13867,7 +14066,7 @@ msgstr ""
 "core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
 "voleu habilitar l'índex dividit"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13875,8 +14074,7 @@ msgstr ""
 "core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
 "voleu inhabilitar l'índex dividit"
 
-#: builtin/update-index.c:1128
-#, fuzzy
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13884,11 +14082,11 @@ msgstr ""
 "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
 "realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13896,10 +14094,10 @@ msgstr ""
 "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
 "realment voleu habilitar el cau no seguit"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
-msgstr "La memòria cau no seguida està habilitada per a '%s'"
+msgstr "La memòria cau no seguida està habilitada per a «%s»"
 
 #: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
@@ -13914,19 +14112,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opcions>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "actualitza <nom de referència>, no la que assenyali"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin té paràmetres acabats amb NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "llegeix les actualitzacions des d'stdin"
 
@@ -13990,107 +14188,114 @@ msgstr "git worktree prune [<opcions>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, 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:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, 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"
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball més vells que <hora>"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
-msgstr "'%s' ja existeix"
+msgstr "«%s» ja existeix"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
-msgstr "no s'ha pogut crear directori de '%s'"
+msgstr "no s'ha pogut crear directori de «%s»"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "S'està preparant %s (identificador %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 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:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B i --detach són mutualment exclusius"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "raó per bloquejar"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
-msgstr "'%s' no és un arbre de treball"
+msgstr "«%s» no és un arbre de treball"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 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:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
-msgstr "'%s' ja està bloquejat, raó: '%s'"
+msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
-msgstr "'%s' ja està bloquejat"
+msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
-msgstr "'%s' no està bloquejat"
+msgstr "«%s» no està bloquejat"
 
 #: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -14112,24 +14317,24 @@ msgstr "només útil per a la depuració"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcions>] <directori>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "surt immediatament després de l'anunci inicial de referència"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 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"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14143,7 +14348,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "imprimeix els missatges de depuració a stderr"
 
@@ -14157,20 +14362,20 @@ 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:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:358
+#: http.c:359
 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:367
+#: http.c:368
 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:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14539,8 +14744,8 @@ msgstr "No s'ha pogut trobar cap comissió en comú amb $pretty_name"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
-msgstr "Ja al dia amb $pretty_name"
+msgid "Already up to date with $pretty_name"
+msgstr "Ja està al dia amb $pretty_name"
 
 #: git-merge-octopus.sh:89
 #, sh-format
@@ -14559,52 +14764,54 @@ msgstr ""
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n"
-"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc "
-"d'això.\n"
-"Per a agafar la branca original i deixar de fer «rebase», executeu \"git "
-"rebase --abort\"."
+"Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\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\"."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No s'ha pogut tornar a $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "S'ha aplicat el magatzem automàtic."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No es pot emmagatzemar $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 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:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "No hi ha un «rebase» en curs?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 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:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14612,7 +14819,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:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14633,103 +14840,102 @@ msgstr ""
 "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
 "de valor."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "font no vàlida $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, 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:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: no hi ha cap base de fusió"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "No assenyala una comissió vàlida: $onto_name"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal: no hi ha tal branca: $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "No es pot emmagatzemar automàticament"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La branca actual $branch_name està al dia."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, 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:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Canvis de $mb a $onto:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
-"Primer, s'està rebobinant el cap per a reproduir el vostre treball al "
-"damunt..."
+"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear amb paràmetres no està implementat"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "No es pot desar els fitxers no seguits"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No es pot actualitzar $ref_stash amb $w_commit"
@@ -14744,7 +14950,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14753,110 +14959,108 @@ msgstr ""
 "error: opció desconeguda de 'stash save': $option\n"
 "       Per a proveir un missatge, useu git stash save -- '$option'"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 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:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, 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:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opció desconeguda: $opt"
 
-#: git-stash.sh:487
-#, fuzzy
+#: git-stash.sh:495
 msgid "No stash entries found."
-msgstr "No s'ha trobat cap magatzem."
+msgstr "No s'ha trobat cap «stash»."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "S'han especificat massa revisions: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no és una referència vàlida"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no és una comissió de tipus magatzem"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no és una referència de magatzem"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 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:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "No s'ha pogut desar l'arbre d'índex"
 
-#: git-stash.sh:579
-#, fuzzy
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
-msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
+msgstr "No s'ha pogut restaurar els fitxers no seguits des del «stash»"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "No es pot fer «unstage» dels fitxers modificats"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "L'índex no estava sense emmagatzemar."
 
-#: git-stash.sh:633
-#, fuzzy
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
-msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
+msgstr ""
+"Es conserva l'entrada «stash» en cas de que la necessiteu altra vegada."
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} ($s) descartada"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
 
@@ -15005,18 +15209,18 @@ msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, 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'"
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, 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:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15025,12 +15229,12 @@ msgstr ""
 "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
 "camí de submòdul '$sm_path'"
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, 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:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15039,87 +15243,87 @@ msgstr ""
 "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:684
+#: git-submodule.sh:683
 #, 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:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, 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'"
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, 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:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, 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'"
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, 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'"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 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:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode inesperat $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, 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:916
+#: git-submodule.sh:915
 #, 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:919
+#: git-submodule.sh:918
 #, 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:1065
+#: 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:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
@@ -15138,13 +15342,13 @@ msgstr "S'està fent «rebase» ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -15156,7 +15360,7 @@ msgstr ""
 " 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 (el reste de la línia) usant l'intèrpret "
+" 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"
@@ -15232,49 +15436,49 @@ msgstr "No es pot moure HEAD a $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "S'està refusant fer «squash» a una fusió: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Error en refer la fusió $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No s'ha pogut escollir $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Aquest és el missatge de comissió núm. ${n}:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "El missatge de comissió núm. ${n} s'ometrà:"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "No es pot escriure $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Això és una combinació de 2 comissions."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No s'ha pogut aplicar $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15290,31 +15494,31 @@ msgstr ""
 "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
 "comissió."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "S'ha aturat a $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, 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:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "S'està executant: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'execució ha fallat: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 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:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15325,7 +15529,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15340,96 +15544,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Ordre desconeguda: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "No s'ha pogut ometre ordres innecessaris d'elecció"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: no es reconeix l'ordre en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
-"Les comissions descartades (més nova a més vella):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"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"
-"Els comportaments possibles són: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
-"missingCommitsCheck. S'està ignorant."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
-"continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "O podeu avortar el «rebase» amb 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15460,13 +15597,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 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ó"
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15474,11 +15611,11 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
 "primer cometeu-los i després executeu 'git rebase --continue' de nou."
 
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "No s'ha pogut cometre els canvis «staged»."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15492,40 +15629,40 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "No s'ha pogut executar l'editor"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "No s'ha pogut agafar $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "No hi ha cap HEAD?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "No s'ha pogut crear el $state_dir temporal"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "No s'ha pogut marcar com a interactiu"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "No s'ha pogut iniciar les comissions reescrites"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15535,7 +15672,7 @@ msgstr ""
 "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Nota que les comissions buides estan comentades"
 
@@ -15734,8 +15871,8 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 "---\n"
-"Per suprimir '%s' línies, feu-les línies ' ' (context).\n"
-"Per suprimir '%s' línies, suprimiu-les.\n"
+"Per suprimir «%s» línies, feu-les línies ' ' (context).\n"
+"Per suprimir «%s» línies, suprimiu-les.\n"
 "Les línies que comencin per %s seran suprimides.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
@@ -16088,60 +16225,60 @@ msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
 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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 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"
+msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' conté el correu redactat.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 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:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr "Camp --suppress-cc desconegut: '%s'\n"
+msgstr "Camp --suppress-cc desconegut: «%s»\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
-msgstr "--confirm setting desconegut: '%s'\n"
+msgstr "--confirm setting desconegut: «%s»\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, 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:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "avís: `:include:` no està suportat: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, 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:518
+#: git-send-email.perl:513
 #, 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:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16150,18 +16287,18 @@ msgid ""
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
-"El fitxer '%s' existeix però també pot ser un rang de comissions\n"
+"El fitxer «%s» existeix però també pot ser un rang de comissions\n"
 "per produir pedaços. Desambigüeu...\n"
 "\n"
 "    * 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:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "S'ha produït un error a l'obrir el directori %s: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16170,7 +16307,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "avís: no s'han enviat pedaços\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16180,17 +16317,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, 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:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16204,31 +16341,31 @@ msgstr ""
 "\n"
 "Netegeu el contingut del cos si no voleu enviar un resum.\n"
 
-#: git-send-email.perl:712
+#: 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:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 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:791
+#: git-send-email.perl:786
 #, 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:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16236,11 +16373,11 @@ msgstr ""
 "Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16249,23 +16386,23 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 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ú)?"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
-msgstr "fatal: l'àlias '%s' s'espandeix a si mateix\n"
+msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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)? "
 
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, 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"
@@ -16273,16 +16410,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA \"%s\" no existeix"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16297,7 +16434,7 @@ msgid ""
 msgstr ""
 "    La llista de Cc de sobre s'ha estès amb adreces addicionals\n"
 "    trobades al missatge de la comissió del pedaç. Per defecte, \n"
-"    send-email pregunta abans d'enviar el missatge quan això succeix.\n"
+"    send-email pregunta abans d'enviar el missatge quan això succeeix.\n"
 "    Aquest comportament està controlat pel paràmetre de configuració\n"
 "    sendemail.confirm.\n"
 "\n"
@@ -16309,287 +16446,133 @@ 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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Requereix contestació a l'enviar correu"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 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."
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, 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"
+msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, 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"
+msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
+msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, 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"
+msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
-msgstr "(%s) no s'ha pogut executar '%s'"
+msgstr "(%s) no s'ha pogut executar «%s»"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) S'està afegint %s: %s des de: '%s'\n"
+msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
-msgstr "(%s) s'ha produït un error en tancar el conducte '%s'"
+msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència invàlida"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, 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:1814
+#: git-send-email.perl:1831
 #, 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"
+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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
-#~ msgid "Could not open file '%s'"
-#~ msgstr "No s'ha pogut obrir el fitxer '%s'"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "en %0.1f segons automàticament..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) ha fallat"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Comissió inicial en "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "El pedaç és buit. S'ha dividit malament?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Encara teniu camins sense fusionar en el vostre índex.\n"
-#~ "Heu oblidat d'usar 'git add'?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "No es poden actualitzar els camins i canviar a la branca '%s' a la "
-#~ "vegada.\n"
-#~ "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr ""
-#~ "S'han especificat camins explícits sense -i o -o; s'està presumint --only "
-#~ "camins..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "mode de recursivitat per defecte"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
-
-#, fuzzy
-#~ msgid "object of unknown type"
-#~ msgstr "tipus d'objecte"
-
-#, fuzzy
-#~ msgid "commit object"
-#~ msgstr "Error en objecte"
-
-#, fuzzy
-#~ msgid "tree object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "blob object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "other tag object"
-#~ msgstr "objecte d'arbre massa curt"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "No hi ha res a excloure per patrons :(exclusió).\n"
-#~ "Potser heu oblidat afegir o ':/' o '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "format no reconegut: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requereix un paràmetre enter positiu"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "la referència '%s' no té %ld components per a :strip"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "format de %.*s desconegut %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: no hi és]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: darrere per %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: davant per %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: davant per %d, darrere per %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** referència no vàlida ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "directori d'objectes increïblement llarg %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
-
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' no és una comissió"
-
-#~ msgid "cannot open file '%s'"
-#~ msgstr "no es pot obrir el fitxer '%s'"
-
-#~ msgid "could not close file %s"
-#~ msgstr "no s'ha pogut tancar el fitxer %s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "nom d'etiqueta massa llarg: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "la capçalera d'etiqueta és massa gran."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà "
-#~ "immediatament\n"
-#~ "per descartar-se."
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Usa un heurístic experimental basat en línies en blanc per a millorar les "
-#~ "diferències"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "el submòdul següent (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-#~ msgstr[1] ""
-#~ "els submòduls següents (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva "
-#~ "història)"
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no accepta paràmetres"
diff --git a/po/de.po b/po/de.po
index 362ebb6bb..a05aca5f3 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: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2017-10-17 09:44+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:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
@@ -95,15 +95,14 @@ msgid ""
 msgstr ""
 "Hinweis: Checke '%s' aus.\n"
 "\n"
-"Sie befinden sich im Zustand eines 'lösgelösten HEAD'. Sie können sich\n"
+"Sie befinden sich im Zustand eines 'losgelösten HEAD'. Sie können sich\n"
 "umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
 "Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
 "ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie einen\n"
 "weiteren Checkout durchführen.\n"
 "\n"
 "Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
-"zu behalten, können Sie das (jetzt oder später) durch einen weiteren "
-"Checkout\n"
+"zu behalten, können Sie das (jetzt oder später) durch einen weiteren Checkout\n"
 "mit der Option -b tun. Beispiel:\n"
 "\n"
 "  git checkout -b <neuer-Branchname>\n"
@@ -119,89 +118,89 @@ msgstr "nicht erkannte Whitespace-Option: '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr ""
 "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr ""
 "Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr ""
 "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
 "%d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "Ungültiger Modus in Zeile %d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "Inkonsistente Kopfzeilen %d und %d."
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: unerwartete Zeile: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -216,72 +215,72 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
 "%d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "neue Datei hängt von alten Inhalten ab"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hängt von alten Inhalten ab"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -289,12 +288,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -303,25 +302,25 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
 "umgekehrten Patch-Block auf '%s'"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -329,434 +328,435 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht"
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
 "zurückzufallen."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Falle zurück auf 3-Wege-Merge ...\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungültiger Pfad '%s'"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s ..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporären Index hinzufügen"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
 msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "nicht erkannte Eingabe"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "unterdrückte %d Whitespace-Fehler"
 msgstr[1] "unterdrückte %d Whitespace-Fehler"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
 msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
 msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "Pfad"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
 "ausgegeben"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
 "ausgeben"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:4947
+#: apply.c:4973
 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:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4977
 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:4979
 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:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:4958
+#: apply.c:4984
 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:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:4960
+#: apply.c:4986
 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:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:4973
+#: apply.c:4999
 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:5001
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
-#: apply.c:4978
+#: apply.c:5004
 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:5007
 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:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
@@ -779,108 +779,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "Format"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "Präfix"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "Datei"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "das Archiv in diese Datei schreiben"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "nur speichern"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "schneller komprimieren"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "besser komprimieren"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "Repository"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "Programm"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Unbekanntes Archivformat '%s'"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument für Format '%s' nicht unterstützt: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gültiger Attributname"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -958,31 +958,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:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -991,7 +991,7 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1001,7 +1001,7 @@ msgstr[1] "(ungefähr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1024,10 +1024,10 @@ msgstr ""
 "endgültigen\n"
 "Commits"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
 
@@ -1069,45 +1069,43 @@ msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr ""
-"Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s durch Rebase."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "Branch '%s' konfiguriert zum Folgen von Remote-Branch '%s' von '%s' durch Rebase."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Branch '%s' konfiguriert zum Folgen von Remote-Branch '%s' von '%s'."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s durch Rebase."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "Branch '%s' konfiguriert zum Folgen von lokalem Branch '%s' durch Rebase."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Branch %s konfiguriert zum Folgen von lokalem Branch %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Branch '%s' konfiguriert zum Folgen von lokalem Branch '%s'."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s durch Rebase."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "Branch '%s' konfiguriert zum Folgen von Remote-Referenz '%s' durch Rebase."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Branch '%s' konfiguriert zum Folgen von Remote-Referenz '%s'."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"Branch %s konfiguriert zum Folgen von lokaler Referenz %s durch Rebase."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "Branch '%s' konfiguriert zum Folgen von lokaler Referenz '%s' durch Rebase."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von lokaler Referenz %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Branch '%s' konfiguriert zum Folgen von lokaler Referenz '%s'."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1130,23 +1128,23 @@ msgstr "'%s' ist kein gültiger Branchname."
 msgid "A branch named '%s' already exists."
 msgstr "Branch '%s' existiert bereits."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
 "Branch."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1167,22 +1165,22 @@ msgstr ""
 "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
 "zu konfigurieren."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Ungültiger Objekt-Name: '%s'"
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "mehrdeutiger Objekt-Name: '%s'"
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Ungültiger Branchpunkt: '%s'"
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
@@ -1202,7 +1200,9 @@ 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:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "Konnte '%s' nicht öffnen"
@@ -1211,56 +1211,56 @@ msgstr "Konnte '%s' nicht öffnen"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, 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:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Das Paket speichert eine komplette Historie."
 
-#: bundle.c:195
+#: bundle.c:202
 #, 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:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "\"rev-list\" abgebrochen"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
@@ -1269,8 +1269,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen"
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
@@ -1280,7 +1280,7 @@ msgstr "konnte %s nicht parsen"
 msgid "%s %s is not a commit!"
 msgstr "%s %s ist kein Commit!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1296,169 +1296,169 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "Speicher verbraucht"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
 "müssen\n"
 "aus Dateien kommen."
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Blob %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "Ungültige Konfigurationszeile %d in Datei %s"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "Ungültige Konfigurationszeile %d in %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "Außerhalb des Bereichs"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "Ungültige Einheit"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
 "%s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
 "%s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
 "%s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
 
-#: config.c:2111
+#: config.c:2156
 #, 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:2122
+#: config.c:2167
 #, 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:2124
+#: config.c:2169
 #, 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:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
@@ -1480,19 +1480,19 @@ msgstr ""
 "bestehen\n"
 "und das Repository existiert."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausführen"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
 
@@ -1603,28 +1603,34 @@ msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
 msgid "Performing inexact rename detection"
 msgstr "Führe Erkennung für ungenaue Umbenennung aus"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "Option '%s' erfordert einen Wert."
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1633,21 +1639,21 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:3427
+#: diff.c:4189
 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:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1656,22 +1662,22 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:4716
+#: diff.c:5505
 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:4719
+#: diff.c:5508
 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:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1679,209 +1685,213 @@ msgstr ""
 "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
 "erneut versuchen."
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2067
+#: dir.c:2102
 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:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtere Inhalt"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "konnte Datei '%s' nicht lesen"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:263
+#: 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:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc benötigt multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "Ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "Ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "Ungültiger Commit %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "Gebe auf"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "Fertig"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Server unterstützt multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Server unterstützt no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Server unterstützt multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Server unterstützt side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Server unterstützt side-band"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Server unterstützt allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Server unterstützt allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Server unterstützt ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "keine solche Remote-Referenz %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
@@ -1894,7 +1904,7 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 msgid "could not create temporary file"
 msgstr "konnte temporäre Datei nicht erstellen"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
@@ -1904,17 +1914,17 @@ 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:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
@@ -1948,7 +1958,8 @@ msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
 #: help.c:358
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
+msgstr ""
+"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
 
 #: help.c:363
 #, c-format
@@ -1972,8 +1983,12 @@ msgid ""
 msgid_plural ""
 "\n"
 "The most similar commands are"
-msgstr[0] "\nDer ähnlichste Befehl ist"
-msgstr[1] "\nDie ähnlichsten Befehle sind"
+msgstr[0] ""
+"\n"
+"Der ähnlichste Befehl ist"
+msgstr[1] ""
+"\n"
+"Die ähnlichsten Befehle sind"
 
 #: help.c:395
 msgid "git version [<options>]"
@@ -2052,12 +2067,12 @@ 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:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2077,7 +2092,7 @@ msgstr ""
 "ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
 "Löschen Sie die Datei manuell um fortzufahren."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Konnte '%s.lock' nicht erstellen: %s"
@@ -2086,78 +2101,78 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(ungültiger Commit)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim Öffnen von '%s': %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, 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:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "Fehler bei Ausführung des internen Merges"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2166,7 +2181,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:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2175,7 +2190,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:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2184,7 +2199,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:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2193,20 +2208,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:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, 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:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2215,143 +2230,143 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelöst)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, 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:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Füge zusammengeführte Datei %s hinzu"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Füge stattdessen als %s hinzu"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "kann Objekt %s nicht lesen"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "Objekt %s ist kein Blob"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "ändern"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "geändert"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "Inhalt"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "hinzufügen/hinzufügen"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "Submodul"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Bereits aktuell!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, 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:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2366,7 +2381,7 @@ msgstr ""
 "Merge\n"
 "von Notizen beginnen."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
@@ -2374,7 +2389,7 @@ msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
 #: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
-"Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen."
+"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
 
 #: notes-utils.c:101
 #, c-format
@@ -2396,16 +2411,30 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
+
+#: packfile.c:1683
+#, 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
+#, 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
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -2413,17 +2442,17 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2432,7 +2461,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "fehlerhafter Objekt-Name '%s'"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
@@ -2508,7 +2537,7 @@ msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
 
-#: pathspec.c:575
+#: 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"
@@ -2517,12 +2546,12 @@ msgstr ""
 "ungültig.\n"
 "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
@@ -2544,52 +2573,53 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schließen"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
 "verboten."
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "Konnte Referenz %s nicht löschen"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Konnte Referenzen nicht entfernen: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Konnte Referenz %s nicht löschen"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "entfernt"
@@ -2619,147 +2649,147 @@ msgstr "Erwartetes Format: %%(color:<Farbe>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "nicht erkannte Farbe: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Positiver Wert erwartet refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nicht erkanntes %%(%s) Argument: %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) akzeptiert keine Argumente"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) akzeptiert keine Argumente"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "unbekanntes %%(trailers) Argument: %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "nicht erkanntes %%(contents) Argument: %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "Positiver Wert erwartet objectname:short=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "nicht erkanntes %%(objectname) Argument: %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nicht erkannte Position:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "nicht erkanntes %%(align) Argument: %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe für %%(align) erwartet"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "nicht erkanntes %%(if) Argument: %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "Fehlerhafter Feldname: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "Unbekannter Feldname: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: %%(then) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "Format: %%(end) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "Fehlerhafter Formatierungsstring %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(kein Branch, Rebase von Branch %s im Gange)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(kein Branch, binäre Suche begonnen bei %s)"
@@ -2767,7 +2797,7 @@ msgstr "(kein Branch, binäre Suche begonnen bei %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD losgelöst bei %s)"
@@ -2775,110 +2805,110 @@ msgstr "(HEAD losgelöst bei %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD losgelöst von %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(kein Branch)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt für %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "Missgebildeter Objektname %s"
 
-#: remote.c:747
+#: remote.c:750
 #, 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:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Kein solcher Branch: '%s'"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1698
+#: remote.c:1699
 #, 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:1713
+#: remote.c:1714
 #, 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:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
@@ -2894,7 +2924,7 @@ msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
 
 #: remote.c:2087
@@ -2944,16 +2974,16 @@ msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzuführen)\n"
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
 
@@ -2996,24 +3026,24 @@ msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstützt keine Push-Optionen"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "interaktives Rebase"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3021,7 +3051,7 @@ msgstr ""
 "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3031,43 +3061,44 @@ msgstr ""
 "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "Fehler beim Fertigstellen von '%s'."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
@@ -3075,20 +3106,20 @@ msgstr "%s: Vorspulen"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "Konnte HEAD-Commit nicht auflösen\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3119,17 +3150,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "Konnte Commit %s nicht parsen\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "Konnte Eltern-Commit %s nicht parsen\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3140,7 +3171,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3151,230 +3182,232 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, 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:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, 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:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "Konnte '%s' nicht lesen."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "Fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "Konnte HEAD nicht sperren"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "Kann '%s' nicht lesen: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "Unerwartetes Dateiende"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, 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:1658
+#: sequencer.c:1677
 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."
+msgstr ""
+"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "Konnte '%s' nicht nach '%s' kopieren."
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "Konnte den Index nicht lesen."
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3390,11 +3423,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 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:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3412,17 +3445,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3433,59 +3466,59 @@ msgstr ""
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "Konnte %s nicht aktualisieren."
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3496,24 +3529,110 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: unbehandelte Optionen"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: Fehler beim Vorbereiten der Commits"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "Unbenutzbare TODO-Liste: '%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. Ignoriere."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
+"Entfernte Commits (neu zu alt):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
+"entfernen.\n"
+"\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
+"Warnungen zu ändern.\n"
+"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
+"'git rebase --continue' aus.\n"
+"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "Konnte Commit '%s' nicht parsen."
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "Konnte '%s' nicht abschneiden."
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "Das Script wurde bereits umgeordnet."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "Konnte '%s' nicht abschließen."
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3547,34 +3666,34 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "Unbekannte Repository-Erweiterungen gefunden:"
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3584,7 +3703,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3593,60 +3712,46 @@ 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:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, 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:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
 "eingehängt."
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, 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?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "Kurzer SHA-1 %s ist mehrdeutig."
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Die Kandidaten sind:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3671,66 +3776,71 @@ msgstr ""
 "indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
 "Sie zuerst die Konflikte auf"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "In nicht ausgechecktem Submodul '%s'."
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' nicht als Git-Repository erkannt"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geänderten Index."
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3738,18 +3848,18 @@ msgstr ""
 "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstützt"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3760,94 +3870,98 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "Ungültiger Wert für %s"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "unbekannter Wert '%s' für Schlüssel %s"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "mehr als ein %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "leerer Anhang-Token in Anhang '%.*s'"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "konnte nicht von der Standard-Eingabe lesen"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "Datei '%s' ist keine reguläre Datei"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "konnte temporäre Datei '%s' nicht öffnen"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "konnte temporäre Datei nicht zu %s umbenennen"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ungültige --depth Option '%s'"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3856,7 +3970,7 @@ msgstr ""
 "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
 "Remote-Repository gefunden wurden:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3883,7 +3997,7 @@ msgstr ""
 "zum Versenden zu einem Remote-Repository.\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Abbruch."
 
@@ -3904,11 +4018,11 @@ msgstr "fehlerhafter Modus in Tree-Eintrag"
 msgid "empty filename in tree entry"
 msgstr "leerer Dateiname in Tree-Eintrag"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3919,7 +4033,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3929,7 +4043,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3939,7 +4053,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3949,7 +4063,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3959,7 +4073,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3968,7 +4082,7 @@ msgstr ""
 "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3978,7 +4092,7 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3988,7 +4102,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3999,7 +4113,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4009,7 +4123,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4020,7 +4134,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4030,7 +4144,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4040,7 +4154,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4051,7 +4165,7 @@ msgstr ""
 "den Checkout überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4063,7 +4177,7 @@ msgstr ""
 "Checkout überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4073,7 +4187,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4083,7 +4197,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4093,7 +4207,7 @@ msgstr ""
 "den %s überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4104,23 +4218,22 @@ msgstr ""
 "%s überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind "
-"nicht\n"
-"aktuell:\n"
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge\n"
+"sind nicht aktuell:\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4131,7 +4244,7 @@ msgstr ""
 "über einen partiellen Checkout überschrieben werden:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4142,7 +4255,7 @@ msgstr ""
 "über einen partiellen Checkout entfernt werden:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4151,19 +4264,12 @@ msgstr ""
 "Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-"Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
-"unterstützt."
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "Checke Dateien aus"
 
@@ -4206,13 +4312,8 @@ msgstr "Fehler beim Lesen von '%s'"
 msgid "could not open '%s' for reading and writing"
 msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen öffnen."
@@ -4236,212 +4337,212 @@ msgstr "Konnte nicht nach '%s' schreiben."
 msgid "could not close %s"
 msgstr "Konnte '%s' nicht schließen."
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Nicht zusammengeführte Pfade:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, 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:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 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:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 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:224
+#: wt-status.c:222
 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:225
+#: wt-status.c:223
 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:227
+#: wt-status.c:225
 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:239
+#: wt-status.c:237
 #, 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:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "beide gelöscht:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "von uns hinzugefügt:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "von denen gelöscht:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "von denen hinzugefügt:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "von uns gelöscht:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "von beiden hinzugefügt:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "von beiden geändert:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "neue Datei:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "kopiert:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "gelöscht:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "geändert:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "umbenannt:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "Typänderung:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "unbekannt:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "nicht gemerged:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "neue Commits, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "geänderter Inhalt, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"Ändern Sie nicht die obige Zeile.\n"
-"Alles unterhalb von ihr wird entfernt."
+"Ändern oder entfernen Sie nicht die obige Zeile.\n"
+"Alles unterhalb von ihr wird ignoriert."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 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:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
@@ -4704,7 +4805,7 @@ msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 #, 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"
+"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
 "Sie \"git add\" zum Versionieren)\n"
 
 #: wt-status.c:1661 wt-status.c:1666
@@ -4757,7 +4858,7 @@ 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:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
@@ -4771,7 +4872,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
@@ -4780,114 +4881,114 @@ msgstr "Aktualisierung der Dateien fehlgeschlagen"
 msgid "remove '%s'\n"
 msgstr "lösche '%s'\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
 "ignoriert:\n"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
 "konnten"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4904,8 +5005,10 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories hinzugefügt.\n"
-"Klone des äußeren Repositories werden die Inhalte des eingebetteten Repositories\n"
+"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories "
+"hinzugefügt.\n"
+"Klone des äußeren Repositories werden die Inhalte des eingebetteten "
+"Repositories\n"
 "weder enthalten, noch wissen, wie diese zu beschaffen sind.\n"
 "Wenn Sie ein Submodul hinzufügen wollten, benutzen Sie:\n"
 "\n"
@@ -4919,159 +5022,159 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" für weitere Informationen."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Füge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Meinten Sie vielleicht 'git add .'?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "Index-Datei beschädigt"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, 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:1172
+#: builtin/am.c:1194
 #, 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:1173
+#: builtin/am.c:1195
 #, 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:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Patch ist leer."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 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:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5079,39 +5182,39 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 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:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "Fehler beim Schreiben des Commit-Objektes."
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 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:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -5119,35 +5222,35 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 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:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, 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:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5158,7 +5261,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5171,17 +5274,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:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5189,135 +5292,134 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 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:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 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:2241
+#: builtin/am.c:2240
 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:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5325,16 +5427,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, 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:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5343,7 +5445,7 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
 
@@ -5552,14 +5654,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<Optionen>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5568,7 +5674,7 @@ msgstr ""
 "entferne Branch '%s', der zusammengeführt wurde mit\n"
 "         '%s', aber noch nicht mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5577,12 +5683,12 @@ msgstr ""
 "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
 "         '%s', obwohl er mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5592,94 +5698,117 @@ msgstr ""
 "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
 "%s' aus."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "kann -a nicht mit -d benutzen"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Fehler beim Entfernen des Branches '%s'"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "Konnte Formatierungsstring nicht parsen."
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Binäre Suche von Branch %s zu %s im Gange"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem befinden."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Kopie des Branches fehlgeschlagen"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "falsch benannten Branch '%s' wegkopiert"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
+"fehlgeschlagen."
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5690,177 +5819,185 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "Informationen zum Upstream-Branch ändern"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "nicht verwenden"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit enthalten"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "einen Branch und dessen Reflog kopieren"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "Schüssel"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "Die Optionen --column und --verbose sind inkompatibel."
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "zu viele Branches für eine Kopieroperation angegeben"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5868,61 +6005,48 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Kein solcher Branch '%s'"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr ""
-"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
 "auf keinen Branch zeigt."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "'HEAD' darf nicht manuell erstellt werden"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
 "Branchnamen verwendet werden."
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
-"track oder --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
-"Sie aus:\n"
+"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
+"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5937,7 +6061,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:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5945,7 +6069,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:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5953,68 +6077,68 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 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:566
+#: builtin/cat-file.c:568
 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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 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:576
+#: builtin/cat-file.c:578
 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:579
+#: builtin/cat-file.c:581
 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:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
@@ -6042,7 +6166,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:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
@@ -6135,9 +6259,9 @@ msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "Zeichenkette"
 
@@ -6210,54 +6334,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 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:628
+#: builtin/checkout.c:632
 #, 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:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6280,7 +6404,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6307,162 +6431,163 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "second guess 'git checkout <no-such-branch>'"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "Bei der Option --track muss ein Branchname angegeben werden."
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Vermisse Branchnamen; versuchen Sie -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, 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."
+msgstr ""
+"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, 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:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6501,7 +6626,7 @@ msgstr "Würde Repository %s überspringen\n"
 msgid "failed to remove %s"
 msgstr "Fehler beim Löschen von %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6514,7 +6639,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6535,38 +6660,38 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Wählen Sie Einträge zum Löschen"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Tschüss.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6584,63 +6709,63 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Befehle ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Was nun"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Würde das folgende Element entfernen:"
 msgstr[1] "Würde die folgenden Elemente entfernen:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6648,7 +6773,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6656,148 +6781,148 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "Pfadspezifikation"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "Name"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 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:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 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:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 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:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6805,42 +6930,42 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, 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:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6850,101 +6975,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:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 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:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht."
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, 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:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6952,45 +7077,45 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 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:1069
+#: builtin/clone.c:1073
 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:1071
+#: builtin/clone.c:1075
 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:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Weiß nicht wie %s zu klonen ist."
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -7016,7 +7141,7 @@ msgstr "Abstand zum linken Rand"
 
 #: builtin/column.c:32
 msgid "Padding space on right border"
-msgstr "Abstand zur rechten Rand"
+msgstr "Abstand zum rechten Rand"
 
 #: builtin/column.c:33
 msgid "Padding space between columns"
@@ -7133,62 +7258,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:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 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:461
+#: builtin/commit.c:463
 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:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7196,38 +7321,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 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:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7242,7 +7367,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7257,7 +7382,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7267,7 +7392,7 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7280,157 +7405,157 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, 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:1068
+#: builtin/commit.c:1075
 #, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "Die Optionen --long und -z sind inkompatibel."
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 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:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts für \"--amend\"."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 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:1165
+#: builtin/commit.c:1172
 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:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 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:1180
+#: builtin/commit.c:1187
 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:1188
+#: builtin/commit.c:1195
 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:1205
+#: builtin/commit.c:1212
 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:1207
+#: builtin/commit.c:1214
 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:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 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:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "ignorierte Dateien anzeigen"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7438,203 +7563,204 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
-msgstr "Konnte neulich erstellten Commit nicht analysieren."
+msgstr "Konnte neu erstellten Commit nicht analysieren."
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (Basis-Commit)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "'Signed-off-by:'-Zeile hinzufügen"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "Standard"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, 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:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7802,12 +7928,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7817,11 +7943,11 @@ msgstr ""
 "       Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
 "       zu ändern."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "gibt Größenangaben in menschenlesbaren Format aus"
 
@@ -7845,47 +7971,47 @@ msgstr "nicht-annotiert"
 msgid "annotated"
 msgstr "annotiert"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "annotiertes Tag %s ist nicht verfügbar"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "Tag '%s' ist eigentlich '%s' hier"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s ist kein gültiges '%s' Objekt"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "suche zur Beschreibung von %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7894,7 +8020,7 @@ msgstr ""
 "Keine annotierten Tags können '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7903,12 +8029,12 @@ msgstr ""
 "Keine Tags können '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7917,79 +8043,79 @@ msgstr ""
 "mehr als %i Tags gefunden; führe die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "nur exakte Ãœbereinstimmungen ausgeben"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 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:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "Kennzeichen"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
 "\")"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
 "\")"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
 
@@ -8003,21 +8129,21 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
 msgid "invalid option: %s"
 msgstr "Ungültige Option: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -8026,27 +8152,27 @@ msgstr "unbehandeltes Objekt '%s' angegeben"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -8054,54 +8180,54 @@ msgstr ""
 "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "Sie könnten diese aufräumen oder wiederherstellen."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<Tool>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -8110,19 +8236,19 @@ msgstr ""
 "Rückkehrwert\n"
 "verschieden 0 ausgeführt wurde"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<Programm>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
@@ -8130,149 +8256,149 @@ msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Kennzeichen in diese Datei schreiben"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "Kennzeichen von dieser Datei importieren"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 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:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8280,91 +8406,91 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "Konnte Remote-Referenz von HEAD nicht finden."
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
-"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
+"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositories mit "
 "unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8373,57 +8499,57 @@ 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:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, 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:997
+#: builtin/fetch.c:1019
 #, 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:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert für %s\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "Weiß nicht wie von %s angefordert wird."
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8432,43 +8558,43 @@ msgstr ""
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
 "Commits angefordert werden sollen."
 
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Sie müssen den Namen des Tags angeben."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen und --depth schließen sich gegenseitig aus"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 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:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 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"
@@ -8481,23 +8607,23 @@ msgstr ""
 "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "Alias für --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
@@ -8537,101 +8663,105 @@ msgstr "Platzhalter als Tcl-String formatieren"
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "Formatfarben beachten"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "nur zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "nur nicht zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<Optionen>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Konnte '%s' nicht lesen: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kann '%s' nicht lesen."
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8647,49 +8777,49 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 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:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, 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:410
+#: builtin/gc.c:411
 #, 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:411
+#: builtin/gc.c:412
 #, 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:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8697,7 +8827,7 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8708,12 +8838,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -8722,259 +8852,251 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, 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:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "Basisname"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "Ãœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 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:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "keine Muster angegeben"
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 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:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "keine Unterstützung von Threads, --threads wird ignoriert"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 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:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "Option wird mit --recurse-submodules nicht unterstützt."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 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:1316
+#: builtin/grep.c:1087
 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:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
 
@@ -9067,12 +9189,12 @@ msgstr "Konnte Version des emacsclient nicht parsen."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "Fehler beim Ausführen von '%s'"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -9081,7 +9203,7 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -9090,352 +9212,352 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Ein Git-Glossar"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen für Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "für `git %s' wurde der Alias `%s' angelegt"
+msgid "'%s' is aliased to '%s'"
+msgstr "Für '%s' wurde der Alias '%s' angelegt."
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "Objekt-Typen passen bei %s nicht zusammen"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, 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:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "konnte '%s' nicht erstellen"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "Kann Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, 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:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "Dekomprimierung gab %d zurück"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 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:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "Unbekannter Objekt-Typ %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "Kann Paketdatei %s nicht lesen"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Fehler in Objekt"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "Löse Unterschiede auf"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflösen der Unterschiede"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "abgeschlossen mit %d lokalem Objekt"
 msgstr[1] "abgeschlossen mit %d lokalen Objekten"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "Paket hat %d unaufgelöste Unterschied"
 msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, 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:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: 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:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
 
@@ -9567,132 +9689,164 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<Token>[(=|:)<Wert>])...] [<Datei>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "vorhandene Dateien direkt bearbeiten"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "kürzt leere Anhänge"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "wo der neue Anhang platziert wird"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "Aktion, wenn Anhang bereits existiert"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "Aktion, wenn Anhang fehlt"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "nur Anhänge ausgeben"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "Regeln aus Konfiguration nicht anwenden"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "Optionen für das Parsen setzen"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "Anhang"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "Anhang/Anhänge hinzufügen"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "Die Optionen --trailer und --only-input können nicht gemeinsam verwendet werden."
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 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:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kann Objekt %s nicht lesen."
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "Name des Ausgabeverzeichnisses ist zu lang."
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9703,221 +9857,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:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> anstatt '.patch' verwenden"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[<Präfix>] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 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:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 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:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "Forschrittsanzeige während der Erzeugung der Patches"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "Die Option --name-only kann nicht verwendet werden."
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "Die Option --name-status kann nicht verwendet werden."
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "Die Option --check kann nicht verwendet werden."
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Erzeuge Patches"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9925,108 +10087,108 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "den Dateistatus mit Tags anzeigen"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "entfernte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "geänderte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "sonstige Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "ignorierte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr ""
 "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
 "anzeigen"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "Zeilenenden von Dateien anzeigen"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "keine leeren Verzeichnisse anzeigen"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' Informationen anzeigen"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "Dateien auslassen, die einem Muster entsprechen"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "Muster, gelesen von <Datei>, ausschließen"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "Ausgabe relativ zum Projektverzeichnis"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "Rekursion in Submodulen durchführen"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "Commit-Referenz"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
 "vorhanden sind"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "Ausgaben zur Fehlersuche anzeigen"
 
@@ -10121,181 +10283,185 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "Leere mbox: '%s'"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 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:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "commit-msg Hook überprüfen"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (nichts zu quetschen)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Unbekannte Option für merge-recursive: -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, 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:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10311,71 +10477,71 @@ msgstr ""
 "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, 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:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 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:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, 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:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)."
+msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10383,7 +10549,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:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10391,117 +10557,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:1191
+#: builtin/merge.c:1218
 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:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie können --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 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:1227
+#: builtin/merge.c:1254
 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:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 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:1268
+#: builtin/merge.c:1295
 #, 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:1271
+#: builtin/merge.c:1298
 #, 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:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, 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:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, 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:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10643,7 +10809,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
@@ -10663,68 +10829,68 @@ msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
 msgid "skip move/rename errors"
 msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für das selbe Ziel"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -10751,7 +10917,7 @@ msgstr "nur Tags verwenden, um die Commits zu benennen"
 
 #: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
-msgstr "nur Referenzen verwenden die <Muster> entsprechen"
+msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
 
 #: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
@@ -10917,19 +11083,19 @@ 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:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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 "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -10957,49 +11123,49 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
 "zurückgewiesen"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "zu viele Parameter"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "Keine Notiz für Objekt %s gefunden."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "Notizinhalte als Zeichenkette"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "Notizinhalte in einer Datei"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "Speichern leerer Notiz erlauben"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "existierende Notizen ersetzen"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11008,31 +11174,31 @@ msgstr ""
 "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
 "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Überschreibe existierende Notizen für Objekt %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Entferne Notiz für Objekt %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "Objekte von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
 "stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "zu wenig Parameter"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11041,12 +11207,12 @@ msgstr ""
 "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
 "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11055,52 +11221,52 @@ msgstr ""
 "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
 "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "unbekannte Merge-Strategie '%s' für Notizen"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Merge-Optionen"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -11108,49 +11274,49 @@ msgstr ""
 "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "nicht zusammengeführte Notizen eintragen"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
 "committet werden"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "Merge von Notizen abbrechen"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "Unbekannter Wert für -s/--strategy: %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11162,235 +11328,235 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "gelöschte Notizen melden"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 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:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 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:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "Nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "Ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 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:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 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:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 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:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 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:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 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:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 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:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
@@ -11406,11 +11572,11 @@ msgstr "alles packen"
 msgid "prune loose refs (default)"
 msgstr "lose Referenzen entfernen (Standard)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "Lösche doppelte Objekte"
 
@@ -11451,7 +11617,7 @@ msgstr "Optionen bezogen auf Merge"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
@@ -11472,7 +11638,7 @@ msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungültiger Wert für pull.ff: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11480,14 +11646,14 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11495,7 +11661,7 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11507,39 +11673,39 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
 "möchten."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<Branch>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 ""
@@ -11547,7 +11713,7 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11557,29 +11723,29 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash ist nur mit --rebase zulässig."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 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:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11589,7 +11755,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11606,17 +11772,19 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen ausführen."
+msgstr ""
+"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
+"ausführen."
 
 #: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -12006,19 +12174,47 @@ msgstr "unpack-trees protokollieren"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<Optionen>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "leere Commits behalten"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "Rebase fortsetzen"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "Rebase abbrechen"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "Rebase-Skript erstellen"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "SHA-1's in der TODO-Liste verkürzen"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "SHA1's in der TODO-Liste erweitern"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "die TODO-Liste prüfen"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "nicht erforderliche \"pick\"-Befehle auslassen"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash-Zeilen umordnen"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -12050,7 +12246,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -12071,11 +12267,11 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Sie müssen ein Repository angeben."
 
@@ -12199,7 +12395,7 @@ msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
 
 #: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "oder fordere gar keine Zweige an (--no-tags)"
+msgstr "oder fordere gar keine Tags an (--no-tags)"
 
 #: builtin/remote.c:167
 msgid "branch(es) to track"
@@ -12231,12 +12427,12 @@ msgstr ""
 "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
 "Spiegelarchiven verwendet werden."
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "externes Repository %s existiert bereits"
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
@@ -12259,17 +12455,17 @@ msgstr "(übereinstimmend)"
 msgid "(delete)"
 msgstr "(lösche)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Kein solches Remote-Repository: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12280,17 +12476,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12302,117 +12498,117 @@ msgstr[0] ""
 "gelöscht;\n"
 "um diesen zu löschen, benutzen Sie:"
 msgstr[1] ""
-"Hinweis: Einige Branches außer der refs/remotes/ Hierarchie wurden nicht "
+"Hinweis: Einige Branches außerhalb der refs/remotes/ Hierarchie wurden nicht "
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "gelöscht"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(keine URL)"
 
@@ -12420,25 +12616,25 @@ msgstr "(keine URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12446,163 +12642,163 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokaler Branch konfiguriert für 'git pull':"
 msgstr[1] "  Lokale Branches konfiguriert für 'git pull':"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokale Referenz konfiguriert für 'git push'%s:"
 msgstr[1] "  Lokale Referenzen konfiguriert für 'git push'%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
 "aus mit:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Kein solches Remote-Repository '%s'"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr ""
 "Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Keine solche URL gefunden: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
@@ -12703,7 +12899,7 @@ msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable und -A sind inkompatibel"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "Fehler beim Löschen von '%s'"
@@ -12836,122 +13032,122 @@ msgstr "zusammenführen"
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, 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:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, meldet nur Fehler"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 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:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, 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:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 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:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, 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:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N kann nur mit -mixed benutzt werden"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "`--` als Argument lassen"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr ""
 "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13043,11 +13239,11 @@ msgstr "Commits mit leerer Beschreibung erlauben"
 msgid "keep redundant, empty commits"
 msgstr "redundante, leere Commits behalten"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "\"revert\" fehlgeschlagen"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" fehlgeschlagen"
 
@@ -13119,17 +13315,17 @@ msgstr "rekursives Entfernen erlauben"
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: konnte %s nicht löschen"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "Konnte '%s' nicht löschen"
@@ -13167,27 +13363,27 @@ msgstr "Status des Remote-Helpers ausgeben"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "über Commit-Ersteller anstatt Autor gruppieren"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Ausgabe mit Zeilenumbrüchen"
 
@@ -13394,35 +13590,35 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, 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:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13432,82 +13628,82 @@ msgstr ""
 "Repository\n"
 "sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, 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:410
+#: builtin/submodule--helper.c:404
 #, 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:420
+#: builtin/submodule--helper.c:414
 #, 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:427
+#: builtin/submodule--helper.c:421
 #, 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:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<Pfad>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, 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:611
+#: builtin/submodule--helper.c:604
 #, 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:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13516,88 +13712,88 @@ msgstr ""
 "<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
 "<Tiefe>] --url <URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ãœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 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:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 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:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "Fehlerhafter Wert für --update Parameter"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13606,20 +13802,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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -13632,24 +13828,24 @@ msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <Name>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "symbolische Referenzen löschen"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "verkürzte Ausgabe der Referenzen"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "Grund"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "Grund für die Aktualisierung"
 
@@ -13679,17 +13875,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<Format>] <Tagname>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "Tag '%s' nicht gefunden."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' gelöscht (war %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13702,7 +13898,7 @@ msgstr ""
 "  %s\n"
 "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13717,142 +13913,142 @@ msgstr ""
 "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
 "selbst entfernen wenn Sie möchten.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "konnte Tag nicht signieren"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column und -n sind inkompatibel"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "Die Option -n ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 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:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "nur eine -F oder -m Option ist erlaubt."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "zu viele Parameter"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -13930,135 +14126,135 @@ msgstr ""
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverändert betrachten"
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit löschen"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit löschen"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
 "Datenbank hinzugefügt"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "Splitting des Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
-"prüfen ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
+"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -14066,7 +14262,7 @@ msgstr ""
 "core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn sie wirklich das Splitting des Index aktivieren möchten."
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -14074,7 +14270,7 @@ msgstr ""
 "core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich das Splitting des Index deaktivieren möchten."
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -14082,11 +14278,11 @@ msgstr ""
 "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten."
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "Cache für unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -14095,7 +14291,7 @@ msgstr ""
 "dies,\n"
 "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
@@ -14113,19 +14309,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<Optionen>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "diese Referenz löschen"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "<Referenzname> aktualisieren, nicht den Verweis"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "Aktualisierungen von der Standard-Eingabe lesen"
 
@@ -14189,104 +14385,111 @@ msgstr "git worktree prune [<Optionen>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, 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:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, 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:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Bereite %s vor (Identifikation %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 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:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schließen sich gegenseitig aus"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
@@ -14311,25 +14514,25 @@ msgstr "nur nützlich für Fehlersuche"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "nach einem einzigen Request/Response-Austausch beenden"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "direkt nach der initialen Angabe der Commits beenden"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 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:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14345,7 +14548,7 @@ msgstr ""
 "\n"
 "auszuführen."
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
 
@@ -14360,22 +14563,22 @@ msgstr ""
 "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
 "Konzept zu erfahren."
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
 
-#: http.c:358
+#: http.c:359
 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:367
+#: http.c:368
 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:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14739,7 +14942,7 @@ msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr ""
-"Fehler Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
+"Fehler: Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
 "Merge\n"
 "überschrieben werden"
 
@@ -14758,7 +14961,7 @@ msgstr "Konnte keinen gemeinsamen Commit mit $pretty_name finden."
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "Bereits aktuell mit $pretty_name"
 
 #: git-merge-octopus.sh:89
@@ -14777,55 +14980,57 @@ msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
-msgstr ""
-"Wenn Sie das Problem aufgelöst haben, führen Sie \"git rebase --continue\" "
-"aus.\n"
-"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"git "
-"rebase --skip\" aus.\n"
-"Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
+"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\"."
+msgstr ""
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <konfliktbehaftete_Dateien>\" und führen Sie dann\n"
+"\"git rebase --continue\" aus.\n"
+"Sie können auch stattdessen diesen Commit auslassen, indem\n"
+"Sie \"git rebase --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
 "führen Sie \"git rebase --abort\" aus."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Konnte nicht zu $head_name zurückgehen"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "Automatischen Stash angewendet."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kann $stash_sha1 nicht speichern."
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 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:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 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:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14833,7 +15038,7 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14854,104 +15059,104 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "ungültiger Upstream-Branch $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, 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:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: es gibt keine Merge-Basis"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "$onto_name zeigt auf keinen gültigen Commit"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal: Branch $branch_name nicht gefunden"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "Kann automatischen Stash nicht erzeugen."
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Automatischen Stash erzeugt: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, 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:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Änderungen von $mb zu $onto:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 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:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name zu $onto_name vorgespult."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "Keine Änderungen ausgewählt"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
@@ -14966,7 +15171,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14976,108 +15181,110 @@ msgstr ""
 "        Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
 "'$option'\""
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "unbekannte Option: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "Keine Stash-Einträge gefunden."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Zu viele Commits angegeben: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference ist keine gültige Referenz"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' ist kein \"stash\"-artiger Commit"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' ist keine \"stash\"-Referenz"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "Konnte den Index nicht aktualisieren."
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
+msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
-msgstr "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
+msgstr ""
+"Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
-msgstr "Der Stash-Eintrag wird behalten, im Falle Sie benötigen diesen nochmal."
+msgstr ""
+"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal benötigen."
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Gelöscht ${REV} ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
 
@@ -15235,17 +15442,17 @@ msgstr ""
 "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
 "entfernt."
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, 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:648
+#: git-submodule.sh:647
 #, 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:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15254,12 +15461,12 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15268,85 +15475,85 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
 "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, 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:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, 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:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 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:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "unerwarteter Modus $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
 
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
 
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisiere Submodul-URL für '$displaypath'"
@@ -15365,25 +15572,25 @@ msgstr "Führe Rebase aus ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 "\n"
 "Befehle:\n"
-" p, pick = Commit verwenden\n"
-" r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
-" e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
-" s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-" f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
-" x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-" d, drop = Commit entfernen\n"
+"p, pick = Commit verwenden\n"
+"r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
+"e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
+"s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
+"f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
+"x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
+"d, drop = Commit entfernen\n"
 "\n"
 "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
 "ausgeführt.\n"
@@ -15458,49 +15665,49 @@ msgstr "Kann HEAD nicht auf $first_parent setzen"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Fehler beim Wiederholen des Merges von $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Konnte $sha1 nicht picken"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Das ist Commit-Beschreibung #${n}:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kann $fixup_msg nicht schreiben"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Das ist eine Kombination aus 2 Commits."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Konnte $sha1... ($rest) nicht anwenden"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15517,31 +15724,31 @@ msgstr ""
 "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
 "können."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Angehalten bei $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Führe aus: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ausführung fehlgeschlagen: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 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:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15554,7 +15761,7 @@ msgstr ""
 "ausführen."
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15570,97 +15777,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Unbekannter Befehl: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 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:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Fehler beim Auslassen von nicht erforderlichen \"pick\"-Befehlen."
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "Konnte HEAD nicht loslösen"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
-"Entfernte Commits (neu zu alt):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
-"entfernen.\n"
-"\n"
-"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der "
-"Warnungen\n"
-"zu ändern.\n"
-"Die möglichen Verhaltensweisen sind: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Nicht erkannte Einstellung $check_level für Option rebase."
-"missingCommitsCheck.\n"
-"Ignoriere."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
-"'git rebase --continue' aus."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15692,13 +15831,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 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:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15708,11 +15847,11 @@ msgstr ""
 "erneut\n"
 "aus."
 
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15726,40 +15865,40 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "Konnte Editor nicht ausführen."
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Konnte $switch_to nicht auschecken."
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "Kein HEAD?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "Konnte nicht als interaktiven Rebase markieren."
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "Konnte neu geschriebene Commits nicht initialisieren."
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15769,7 +15908,7 @@ msgstr ""
 "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Leere Commits sind auskommentiert."
 
@@ -16329,7 +16468,7 @@ msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
 #: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
-msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n"
+msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
 #: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
@@ -16396,63 +16535,63 @@ msgstr ""
 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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "Der Editor wurde unsauber beendet, breche alles ab."
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, 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:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 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:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, 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:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, 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:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16469,12 +16608,12 @@ msgstr ""
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16483,7 +16622,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "Warnung: Es wurden keine Patches versendet.\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16493,17 +16632,17 @@ msgstr ""
 "keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16518,32 +16657,32 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:712
+#: 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:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 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:791
+#: git-send-email.perl:786
 #, 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:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16551,11 +16690,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16569,22 +16708,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 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:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -16592,18 +16731,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:944
+#: git-send-email.perl:939
 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:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16632,135 +16771,178 @@ 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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 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:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, 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:1534
+#: git-send-email.perl:1549
 #, 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:1582
+#: git-send-email.perl:1597
 #, 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:1605
+#: git-send-email.perl:1622
 #, 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:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, 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:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
 
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) akzeptiert keine Argumente"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
+#~ "unterstützt."
+
+#~ msgid "change upstream info"
+#~ msgstr "Informationen zum Upstream-Branch ändern"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, "
+#~ "führen Sie aus:\n"
+
+#~ msgid "basename"
+#~ msgstr "Basisname"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
+
 #~ msgid "Could not open file '%s'"
 #~ msgstr "Konnte Datei '%s' nicht öffnen"
 
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 000000000..89a2dc014
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,16599 @@
+# Spanish translations for Git.
+# Copyright (C) 2017 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
+# This file is distributed under the same license as the Git package.
+# Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017.
+#
+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-16 21:15-0500\n"
+"Last-Translator: christopher.diaz.riv@gmail.com\n"
+"Language-Team: CodeLabora <codelabora@gmail.com>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.5\n"
+
+#: advice.c:58
+#, c-format
+msgid "hint: %.*s\n"
+msgstr "ayuda: %.*s\n"
+
+#: advice.c:86
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
+
+#: advice.c:88
+msgid "Committing is not possible because you have unmerged files."
+msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
+
+#: advice.c:90
+msgid "Merging is not possible because you have unmerged files."
+msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
+
+#: advice.c:92
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
+
+#: advice.c:94
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "No es posible revertir porque tienes archivos sin fusionar."
+
+#: advice.c:96
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "No es posible %s porque tienes archivos sin fusionar."
+
+#: advice.c:104
+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."
+msgstr ""
+"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
+"como sea apropiado, para marcar la resolución y realizar un commit."
+
+#: advice.c:112
+msgid "Exiting because of an unresolved conflict."
+msgstr "Saliendo porque existe un conflicto sin resolver."
+
+#: advice.c:117 builtin/merge.c:1211
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
+
+#: advice.c:119
+msgid "Please, commit your changes before merging."
+msgstr "Por favor, realiza un commit antes de fusionar."
+
+#: advice.c:120
+msgid "Exiting because of unfinished merge."
+msgstr "Saliendo por una fusion inconclusa."
+
+#: advice.c:126
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+"  git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Nota: actualizando el árbol de trabajo '%s'.\n"
+"\n"
+"Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n"
+"cambios experimentales y confirmarlos, y puedes descartar cualquier\n"
+"commit que hayas hecho en este estado sin impactar a tu rama realizando\n"
+"otro checkout.\n"
+"\n"
+"Si quieres crear una nueva rama para mantener los commits que has creado,\n"
+"puedes hacerlo (ahora o después) usando -b con el comando checkout. "
+"Ejemplo:\n"
+"\n"
+"  git checkout -b <nombre-de-nueva-rama>\n"
+"\n"
+
+#: apply.c:58
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opcion de espacios en blanco no reconocida '%s'"
+
+#: apply.c:74
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opcion de ignorar espacios en blanco no reconocida '%s'"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject y --3way no se pueden utilizar juntas."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached y --3way no se pueden utilizar juntas."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way esta fuera de un repositorio"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index esta fuera de un repositorio"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached esta fuera de un repositorio"
+
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "No se puede preparar una marca de tiempo para la expresion regular %s"
+
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec retorno %d para la entrada: %s"
+
+#: apply.c:928
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr ""
+"no se puede encontrar el nombre del archivo en el parche en la linea %d"
+
+#: apply.c:966
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: mal git-diff - se esperaba /dev/null, se encontro %s en la linea "
+"%d"
+
+#: apply.c:972
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la linea "
+"%d"
+
+#: apply.c:973
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: mal git-diff - viejo nombre de archivo inconsistente en la linea "
+"%d"
+
+#: apply.c:978
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: mal git-diff - se esperaba /dev/null en la linea %d"
+
+#: apply.c:1007
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo invalido en la linea %d: %s"
+
+#: apply.c:1325
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "header inconsistente en las lineas %d y %d"
+
+#: apply.c:1497
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: linea inesperada: %.*s"
+
+#: apply.c:1566
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragmento de parche sin header en la linea %d: %.*s"
+
+#: apply.c:1586
+#, c-format
+msgid ""
+"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)"
+msgstr[0] ""
+"al header de git diff carece de informacion del nombre del archivo %d cuando "
+"lo remueve de la ruta principalcomponente (linea %d)"
+msgstr[1] ""
+"los headers de git diff carecen de informacion de los nombres de los "
+"archivos %d cuando los remueven de la ruta principalcomponentes (linea %d)"
+
+#: apply.c:1599
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+"el header de git diff carece de informacion del nombre del archivo (linea %d)"
+
+#: apply.c:1787
+msgid "new file depends on old contents"
+msgstr "el nuevo archivo depende de contenidos viejos"
+
+#: apply.c:1789
+msgid "deleted file still has contents"
+msgstr "el archivo eliminado todavia tiene contenido"
+
+#: apply.c:1823
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "parche corrupto en la linea %d"
+
+#: apply.c:1860
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nuevo archivo %s depende en contenidos viejos"
+
+#: apply.c:1862
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "el archivo borrado %s todavia tiene contenido"
+
+#: apply.c:1865
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** peligro: el archivo %s esta vacio pero no es borrado"
+
+#: apply.c:2012
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "parche binario corrupto en la linea %d: %.*s"
+
+#: apply.c:2049
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "parche binario no reconocido en la linea %d"
+
+#: apply.c:2209
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "parche que solo contiene basura en la linea %d"
+
+#: apply.c:2295
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "no es posible leer el symlink %s"
+
+#: apply.c:2299
+#, c-format
+msgid "unable to open or read %s"
+msgstr "no es posible abrir o leer %s"
+
+#: apply.c:2958
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "comienzo invalido de linea: '%c'"
+
+#: apply.c:3077
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Hunk #%d tuvo exito en %d (%d linea compensada)."
+msgstr[1] "Hunk #%d tuvo exito en %d (%d lineas compensadas)."
+
+#: apply.c:3089
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
+
+#: apply.c:3095
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"Mientras se busca:\n"
+"%.*s"
+
+#: apply.c:3117
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "data perdida en parche binario para '%s'"
+
+#: apply.c:3125
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
+
+#: apply.c:3171
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "no se puede aplcar el parche binario a '%s' sin un indice completo"
+
+#: apply.c:3181
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
+"actuales."
+
+#: apply.c:3189
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "el parche aplica a un '%s' vacio, pero este no lo esta"
+
+#: apply.c:3207
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "la postimagen necesaria %s para '%s' no se puede leer"
+
+#: apply.c:3220
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "el parche binario no aplica para '%s'"
+
+#: apply.c:3226
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
+"obtuvo %s)"
+
+#: apply.c:3247
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "el parche fallo: %s:%ld"
+
+#: apply.c:3369
+#, c-format
+msgid "cannot checkout %s"
+msgstr "no se puede hacer checkout a %s"
+
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
+#, c-format
+msgid "failed to read %s"
+msgstr "no se pudo leer %s"
+
+#: apply.c:3426
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "leyendo de '%s' tras un symbolic link"
+
+#: apply.c:3455 apply.c:3695
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "la ruta %s ha sido renombrada/suprimida"
+
+#: apply.c:3538 apply.c:3709
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: no existe en el indice"
+
+#: apply.c:3547 apply.c:3717
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: no concuerda con el indice"
+
+#: apply.c:3582
+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"
+
+#: apply.c:3585
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Retrocediendo en un merge de tres-vias...\n"
+
+#: apply.c:3601 apply.c:3605
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "no se pueden leer los contenidos actuales de '%s'"
+
+#: apply.c:3617
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Fallo el merge en retroceso de tres-vias...\n"
+
+#: apply.c:3631
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Parche aplicado a '%s' con conflictos.\n"
+
+#: apply.c:3636
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Parche aplicado a '%s' limpiamente\n"
+
+#: apply.c:3662
+msgid "removal patch leaves file contents"
+msgstr "parche de remocion deja contenidos en el archivo"
+
+#: apply.c:3734
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: tipo incorrecto"
+
+#: apply.c:3736
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s tiene tipo %o, se esperaba %o"
+
+#: apply.c:3886 apply.c:3888
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ruta invalida '%s'"
+
+#: apply.c:3944
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: ya existe en el indice"
+
+#: apply.c:3947
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: ya existe en el directorio de trabajo"
+
+#: apply.c:3967
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
+
+#: apply.c:3972
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
+
+#: apply.c:3992
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "archivo afectado '%s' esta tras un symbolic link"
+
+#: apply.c:3996
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: el parche no aplica"
+
+#: apply.c:4011
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Revisando el parche %s..."
+
+#: apply.c:4102
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "falta informacion del sha1 o es inutil para el submodulo %s"
+
+#: apply.c:4109
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
+
+#: apply.c:4112
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "falta informacion sha1 o es inutil (%s)."
+
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry fallo para la ruta '%s'"
+
+#: apply.c:4121
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "no se pudo anadir %s al indice temporal"
+
+#: apply.c:4131
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "no se pudo escribir un indice temporal para %s"
+
+#: apply.c:4269
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "no se puede remover %s del indice"
+
+#: apply.c:4304
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "parche corrupto para el submodulo %s"
+
+#: apply.c:4310
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "no es posible establecer el archivo recien creado '%s'"
+
+#: apply.c:4318
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+"no es posible crear una copia de seguridad para el archivo recien creado %s"
+
+#: apply.c:4324 apply.c:4468
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "no es posible agregar una entrada en el cache para %s"
+
+#: apply.c:4365
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "fallo escribir para '%s'"
+
+#: apply.c:4369
+#, c-format
+msgid "closing file '%s'"
+msgstr "cerrando archivo '%s'"
+
+#: apply.c:4439
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "no es posible escribir el archivo '%s' modo %o"
+
+#: apply.c:4537
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Parche %s aplicado limpiamente"
+
+#: apply.c:4545
+msgid "internal error"
+msgstr "Error interno"
+
+#: apply.c:4548
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Aplicando parche %%s con %d rechazo..."
+msgstr[1] "Aplicando parche %%s con %d rechazos..."
+
+#: apply.c:4559
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "truncando el nombre de archivo .rej a %.*s.rej "
+
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
+#, c-format
+msgid "cannot open %s"
+msgstr "no se puede abrir %s"
+
+#: apply.c:4581
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Hunk #%d aplicado limpiamente"
+
+#: apply.c:4585
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "hunk #%d rechazado"
+
+#: apply.c:4695
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Parche '%s' saltado."
+
+#: apply.c:4703
+msgid "unrecognized input"
+msgstr "input no reconocido"
+
+#: apply.c:4722
+msgid "unable to read index file"
+msgstr "no es posible leer el archivo indice"
+
+#: apply.c:4859
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "no se puede abrir el parche '%s': %s"
+
+#: apply.c:4886
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d error de espacios en blanco aplastado"
+msgstr[1] "%d errores de espacios en blanco aplastados"
+
+#: apply.c:4892 apply.c:4907
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d linea agrega errores de espacios en blanco."
+msgstr[1] "%d lineas agregan erroes de espacios en blanco."
+
+#: apply.c:4900
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+"%d linea aplicada despues de arreglar los errores de espacios en blanco."
+msgstr[1] ""
+"%d lineas aplicadas despues de arreglar los errores de espacios en blanco."
+
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
+msgid "Unable to write new index file"
+msgstr "No es posible escribir el archivo indice"
+
+#: 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
+msgid "path"
+msgstr "ruta"
+
+#: apply.c:4948
+msgid "don't apply changes matching the given path"
+msgstr "no aplicar cambios que concuerden con la ruta suministrada"
+
+#: apply.c:4951
+msgid "apply changes matching the given path"
+msgstr "aplicar cambios que concuerden con la ruta suministrada"
+
+#: apply.c:4953 builtin/am.c:2265
+msgid "num"
+msgstr "num"
+
+#: apply.c:4954
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "remover <num> slashes iniciales de las rutas diff tradicionales"
+
+#: apply.c:4957
+msgid "ignore additions made by the patch"
+msgstr "ignorar adiciones hechas por el parche"
+
+#: apply.c:4959
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "en lugar de aplicar elparche, mostrar diffstat para la entrada"
+
+#: apply.c:4963
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "mostrar el numero de lineas agregadas y elminadas en notacion decimal"
+
+#: apply.c:4965
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
+
+#: apply.c:4967
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
+
+#: apply.c:4969
+msgid "make sure the patch is applicable to the current index"
+msgstr "asegurar que el parche es aplicable al indice actual"
+
+#: apply.c:4971
+msgid "apply a patch without touching the working tree"
+msgstr "aplicar un parche sin tocar el arbol de trabajo"
+
+#: apply.c:4973
+msgid "accept a patch that touches outside the working area"
+msgstr "aceptar un parche que toca fuera del area de trabajo"
+
+#: apply.c:4975
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "tambien aplicar el parche ( usar con --stat/--summary/--check"
+
+#: apply.c:4977
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "intentar merge de tres-vias si el parche no aplica"
+
+#: apply.c:4979
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+"construir un indice temporal basado en la informacion del indice incrustado"
+
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
+msgid "paths are separated with NUL character"
+msgstr "rutas estan separadas con un caracter NULL "
+
+#: apply.c:4984
+msgid "ensure at least <n> lines of context match"
+msgstr "asegure que por lo menos <n> lineas del contexto concuerden"
+
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+msgid "action"
+msgstr "accion"
+
+#: apply.c:4986
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+"detectar lineas nuevas o modificadas que contienen errores de espacios en "
+"blanco"
+
+#: apply.c:4989 apply.c:4992
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
+
+#: apply.c:4995
+msgid "apply the patch in reverse"
+msgstr "aplicar el parche en reversa"
+
+#: apply.c:4997
+msgid "don't expect at least one line of context"
+msgstr "no espera al menos una linea del contexto"
+
+#: apply.c:4999
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
+
+#: apply.c:5001
+msgid "allow overlapping hunks"
+msgstr "permitir solapamiento de hunks"
+
+#: 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
+msgid "be verbose"
+msgstr "ser verboso"
+
+#: apply.c:5004
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+"tolerar nuevas lineas faltantes detectadas incorrectamente al final del "
+"archivo"
+
+#: apply.c:5007
+msgid "do not trust the line counts in the hunk headers"
+msgstr "no confiar en el conteo de lineas en los headers del hunk"
+
+#: apply.c:5009 builtin/am.c:2253
+msgid "root"
+msgstr "raiz"
+
+#: apply.c:5010
+msgid "prepend <root> to all filenames"
+msgstr "anteponer <root> a todos los nombres de archivos"
+
+#: archive.c:13
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opciones>] <parte-del-arbol> [<ruta>...]"
+
+#: archive.c: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 <repo> [--exec <comando> ] [<opciones>] <parte-del-"
+"arbol> [<ruta>...]"
+
+#: archive.c:16
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repo> [--exec <comando>] --list"
+
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "ruta especificada '%s' no concordo con ninguna carpeta"
+
+#: archive.c:436
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:436
+msgid "archive format"
+msgstr "formato del archivo"
+
+#: archive.c:437 builtin/log.c:1452
+msgid "prefix"
+msgstr "prefijo"
+
+#: archive.c:438
+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: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
+msgid "file"
+msgstr "carpeta"
+
+#: archive.c:440 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "escribe el archivo en esta carpeta"
+
+#: archive.c:442
+msgid "read .gitattributes in working directory"
+msgstr "leer .gitatributes en el directorio de trabajo"
+
+#: archive.c:443
+msgid "report archived files on stderr"
+msgstr "reportar archivos archivados por stderr"
+
+#: archive.c:444
+msgid "store only"
+msgstr "solo guardar"
+
+#: archive.c:445
+msgid "compress faster"
+msgstr "comprimir mas rapido"
+
+#: archive.c:453
+msgid "compress better"
+msgstr "comprimir mejor"
+
+#: archive.c:456
+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:634 builtin/submodule--helper.c:1001
+msgid "repo"
+msgstr "repo"
+
+#: archive.c:459 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "obtener la carpeta del repositorio remoto <repo>"
+
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+msgid "command"
+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 "
+
+#: archive.c:468
+msgid "Unexpected option --remote"
+msgstr "opcion inesperada --remote"
+
+#: archive.c:470
+msgid "Option --exec can only be used together with --remote"
+msgstr "Opcion --exec solo puede ser utilizada con --remote"
+
+#: archive.c:472
+msgid "Unexpected option --output"
+msgstr "Opcion inesperada --output"
+
+#: archive.c:494
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato de carpeta desconocido '%s'"
+
+#: archive.c:501
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento no soprtado para formato '%s': -%d"
+
+#: attr.c:218
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s no es un nombre de atributo valido"
+
+#: attr.c:415
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Los patrones negativos son ignorados en los atributos de git\n"
+"Usa '\\!' para comenzar literalmente con exclamacion."
+
+#: bisect.c:447
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Revisa las comillas en el archivo '%s': %s"
+
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "No podemos bisecar mas!\n"
+
+#: bisect.c:708
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "No es un nombre de commit valido %s"
+
+#: bisect.c:732
+#, 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 fusion %s esta mal.\n"
+"Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n"
+
+#: bisect.c:737
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s es nueva.\n"
+"Esta propiedad ha cambiado entre %s y [%s].\n"
+
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fusion %s es %s.\n"
+"Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"
+
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestors of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
+msgstr ""
+"Algunas %s revisiones no son ancestros de la revision %s.\n"
+"git bisect no puede trabajar bien en este caso.\n"
+"Tal vez confundio la revision %s y %s?\n"
+
+#: bisect.c:763
+#, 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"
+"Vamos a continuar de todas maneras."
+
+#: bisect.c:798
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisectando: una base de fusion debe ser probada\n"
+
+#: bisect.c:850
+#, c-format
+msgid "a %s revision is needed"
+msgstr "una %s revision es necesaria"
+
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
+#, c-format
+msgid "could not create file '%s'"
+msgstr "no se pudo crear el archivo '%s'"
+
+#: bisect.c:918
+#, c-format
+msgid "could not read file '%s'"
+msgstr "no se pudo leer el archivo '%s'"
+
+#: bisect.c:948
+msgid "reading bisect refs failed"
+msgstr "fallo leer las refs de bisect"
+
+#: bisect.c:968
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s fue tanto %s como %s\n"
+
+#: bisect.c:976
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"No se encontró confirmación que se pueda probar.\n"
+"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
+
+#: bisect.c:995
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadamente %d paso)"
+msgstr[1] "(aproximadamente %d pasos)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1001
+#, 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 revision por probar despues de esto %s\n"
+msgstr[1] "Bisectando: faltan %d revisiones por probar despues de esto %s\n"
+
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents y --reverse no se mezclan bien."
+
+#: blame.c:1768
+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
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse y --first-parent juntos requieren especificar el ultimo commit"
+
+#: 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
+msgid "revision walk setup failed"
+msgstr "fallo la configuracion del camino de revision"
+
+#: blame.c:1815
+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 "
+"del primer padre"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "no hay una ruta %s en %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "no se puede leer el blob %s para la ruta %s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"Tras arreglar la causa del error puedes intentar arreglar\n"
+"la infomacion del rastreo remoto invocando\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "La rama %s no se configura como su propio upstream."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
+"por rebase."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
+"rebase."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
+"rebase."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "No es posible escribir la configuracion de la rama upstream"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "No rastreando: informacion ambigua para la referencia %s"
+
+#: branch.c:185
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' no es un nombre valido de rama."
+
+#: branch.c:190
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Una rama llamada '%s' ya existe."
+
+#: branch.c:197
+msgid "Cannot force update the current branch."
+msgstr "No se puede forzar la actualizacion de la rama actual."
+
+#: branch.c:217
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"No se puede configurar el rastreo de informacion; el punto de partida '%s' "
+"no es una rama"
+
+#: branch.c:219
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "la rama de upstream solicitada '%s' no existe"
+
+#: branch.c:221
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"Si estas planeando basar tu trabajo en una rama upstream\n"
+"que ya existe en el remoto, tal vez necesites ejecutar\n"
+"\"git fetch\" para recibirla.\n"
+"\n"
+"Si estás planeando hacer push a una nueva rama local que\n"
+"va a rastrear a su contraparte remota, tal vez quieras usar\n"
+"\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
+"el push."
+
+#: branch.c:264
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Nombre de objeto no valido: '%s'."
+
+#: branch.c:284
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Nombre de objeto ambiguo: '%s'."
+
+#: branch.c:289
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Punto de rama no valido: '%s'."
+
+#: branch.c:343
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ya ha sido marcado en '%s'"
+
+#: branch.c:366
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "la HEAD del arbol de trabajo %s no esta actualizada"
+
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' no se ve como un archivo bundle v2"
+
+#: bundle.c:62
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "header no reconocido %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
+#, c-format
+msgid "could not open '%s'"
+msgstr "no se pudo abrir '%s'"
+
+#: bundle.c:140
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Al repositorio le falta estos commits prerequisito:"
+
+#: bundle.c:193
+#, 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
+msgid "The bundle records a complete history."
+msgstr "El bundle registra una historia completa."
+
+#: bundle.c:202
+#, 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
+msgid "Could not spawn pack-objects"
+msgstr "no se pudo engendrar el pack-objetcts"
+
+#: bundle.c:272
+msgid "pack-objects died"
+msgstr "pack-objects muerio"
+
+#: bundle.c:314
+msgid "rev-list died"
+msgstr "rev-list muerio"
+
+#: bundle.c:363
+#, 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:174 builtin/log.c:1597 builtin/shortlog.c:296
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumento no reconocido: %s"
+
+#: bundle.c:461
+msgid "Refusing to create empty bundle."
+msgstr "Rechazando crear un bundle vacio."
+
+#: bundle.c:473
+#, c-format
+msgid "cannot create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: bundle.c:501
+msgid "index-pack died"
+msgstr "index-pack murio"
+
+#: color.c:301
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "color inválido: %.*s"
+
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
+#, c-format
+msgid "could not parse %s"
+msgstr "no se puede anazliar %s"
+
+#: commit.c:43
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s no es un commit!"
+
+#: commit.c:1517
+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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
+"Tal vez quiera enmendarlo despues de arreglar el mensaje, o arreglar la\n"
+"variable de configuracion i18n.commitencoding para el codificacion que usa "
+"su proyecto.\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "memoria agotada"
+
+#: config.c:187
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"la configuracion relativa incluye condicionales que deben venir de archivos"
+
+#: config.c:721
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "mala linea de config %d en el blob %s"
+
+#: config.c:725
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "mala linea de config %d en el archivo %s"
+
+#: config.c:729
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "mala linea de config %d en la entrada standard"
+
+#: config.c:733
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "mala linea de config %d en el submodulo-blob %s"
+
+#: config.c:737
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "mala linea de config %d en la linea de comando %s"
+
+#: config.c:741
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "mala linea de config %d en %s"
+
+#: config.c:869
+msgid "out of range"
+msgstr "fuera de rango"
+
+#: config.c:869
+msgid "invalid unit"
+msgstr "unidad invalida"
+
+#: config.c:875
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "mal valor de config numerica '%s' para '%s': %s"
+
+#: config.c:880
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "mal valor de config numerica '%s' para '%s' en el blob %s: %s"
+
+#: config.c:883
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "mal valor de config numerica '%s' para '%s' en el archivo %s: %s"
+
+#: config.c:886
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "mal valor de config numerica '%s' para '%s' en la entrada standard: %s"
+
+#: config.c:889
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"mal valor de config numerica '%s' para '%s' en el submodulo-blob %s: %s"
+
+#: config.c:892
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"mal valor de config numerica '%s' para '%s' en la linea de comando %s: %s"
+
+#: config.c:895
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "mal valor de config numerica '%s' para '%s' en %s: %s"
+
+#: config.c:990
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "fallo al expandir el directorio de usuario en: '%s'"
+
+#: config.c:1085 config.c:1096
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "mala compresion zlib en nivel %d"
+
+#: config.c:1213
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "modo invalido de creacion de objetos: %s"
+
+#: config.c:1372
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "mala compresion pack en el nivel %d"
+
+#: config.c:1568
+msgid "unable to parse command-line config"
+msgstr "no es posible analizar la configuracion de la linea de comando"
+
+#: config.c:1900
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"error desconocido ocurrio mientras se leian los archivos de configuracion"
+
+#: config.c:2087
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Invalido %s: '%s'"
+
+#: config.c:2130
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"
+
+#: config.c:2156
+#, 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:2167
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "no es posible analizar '%s' de la configuracion de la linea de comando"
+
+#: config.c:2169
+#, 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 linea %d"
+
+#: config.c:2228
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s tiene multiples valores"
+
+#: config.c:2571 config.c:2789
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat en %s fallo"
+
+#: config.c:2678
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "no se pudo configurar '%s' a '%s'"
+
+#: config.c:2680 builtin/remote.c:776
+#, c-format
+msgid "could not unset '%s'"
+msgstr "no se pudo desactivar '%s'"
+
+#: connect.c:50
+msgid "The remote end hung up upon initial contact"
+msgstr "El remoto se colgo en el contacto inicial"
+
+#: connect.c:52
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"No se pudo leer del repositorio remoto.\n"
+"\n"
+"Por favor asegurese que tiene los permisos de acceso correctos\n"
+"y que el repositorio existe."
+
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+msgid "Checking connectivity"
+msgstr "Verificando conectividad"
+
+#: connected.c:76
+msgid "Could not run 'git rev-list'"
+msgstr "No se pudo correr 'git rev-list'"
+
+#: connected.c:96
+msgid "failed write to rev-list"
+msgstr "fallo escribir a rev-list"
+
+#: connected.c:103
+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 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"
+"El archivo tendra sus finals de linea originales en tu directorio de trabajo."
+
+#: convert.c:209
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF sera remplazado por LF en %s."
+
+#: convert.c:215
+#, 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"
+"El archivo tendra sus finales de linea 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"
+
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "hace %<PRIuMAX> segundo"
+msgstr[1] "hace %<PRIuMAX> segundos"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "hace %<PRIuMAX> minuto"
+msgstr[1] "hace %<PRIuMAX> minutos"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "hace %<PRIuMAX> hora"
+msgstr[1] "hace %<PRIuMAX> horas"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "hace %<PRIuMAX> día"
+msgstr[1] "hace %<PRIuMAX> días"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "hace %<PRIuMAX> semana"
+msgstr[1] "hace %<PRIuMAX> semanas"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "hace %<PRIuMAX> mes"
+msgstr[1] "hace %<PRIuMAX> meses"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> año"
+msgstr[1] "%<PRIuMAX> años"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:170
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, y %<PRIuMAX> mes atrás"
+msgstr[1] "%s, y %<PRIuMAX> meses atrás"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "hace %<PRIuMAX> año"
+msgstr[1] "hace %<PRIuMAX> años"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "fallo al leer orden de archivos '%s'"
+
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "Realizando una deteccion de cambios de nombre inexacta"
+
+#: diff.c:74
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "opcion '%s' requiere un valor"
+
+#: diff.c:152
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Fallo al analizar dirstat porcentaje de corte '%s'\n"
+
+#: diff.c:157
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  parametro '%s' de dirstat desconocido\n"
+
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, "
+"'plain'"
+
+#: 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'"
+
+#: diff.c:398
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Errores en la variable de config 'diff.dirstat' encontrados:\n"
+"%s"
+
+#: diff.c:3861
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "digg externo murio, deteniendo en %s"
+
+#: diff.c:4189
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
+
+#: diff.c:4279
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requiere exactamente un pathspec"
+
+#: diff.c:4445
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Fallo al analizar parametro de opcion --dirstat/-X:\n"
+"%s"
+
+#: diff.c:4459
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Fallo al analizar parametro de opcion --submodule: '%s'"
+
+#: diff.c:5505
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"deteccion de cambio de nombre inexacta fue saltada por haber muchos archivos"
+
+#: diff.c:5508
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"solo se encontraron copias de rutas modificadas por haber muchos archivos"
+
+#: diff.c:5511
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"tal vez quiera configurar la variable %s para por lo menos %d y volver a "
+"intentar el comando."
+
+#: dir.c:1983
+msgid "failed to get kernel name and information"
+msgstr "fallo al conseguir la informacion y nombre del kernel"
+
+#: dir.c:2102
+msgid "Untracked cache is disabled on this system or location."
+msgstr "Untracked cache esta desactivado en este sistema o ubicacion"
+
+#: dir.c:2885 dir.c:2890
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no se pudo crear directorios para %s"
+
+#: dir.c:2915
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
+
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtrando contenido"
+
+#: entry.c:433
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no se pudo establecer el archivo '%s'"
+
+#: fetch-pack.c:252
+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:283 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+#: fetch-pack.c:284
+#, 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
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc requiere multi_ack_detailed"
+
+#: fetch-pack.c:422
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "linea poco profunda invalida: %s"
+
+#: fetch-pack.c:428
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "línea superficial inválida: %s"
+
+#: fetch-pack.c:430
+#, c-format
+msgid "object not found: %s"
+msgstr "objeto no encontrado: %s"
+
+#: fetch-pack.c:433
+#, c-format
+msgid "error in object: %s"
+msgstr "error en objeto: %s"
+
+#: fetch-pack.c:435
+#, c-format
+msgid "no shallow found: %s"
+msgstr "superficie no encontrada: %s"
+
+#: fetch-pack.c:438
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "se esperaba shallow/unshallow, se obtuvo %s"
+
+#: fetch-pack.c:477
+#, c-format
+msgid "got %s %d %s"
+msgstr "se obtuvo %s %d %s"
+
+#: fetch-pack.c:491
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit inválido %s"
+
+#: fetch-pack.c:524
+msgid "giving up"
+msgstr "rindiendose"
+
+#: fetch-pack.c:534 progress.c:242
+msgid "done"
+msgstr "listo"
+
+#: fetch-pack.c:546
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "se obtuvo %s (%d) %s"
+
+#: fetch-pack.c:592
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marcando %s como completa"
+
+#: fetch-pack.c:776
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ya se tiene %s (%s)"
+
+#: fetch-pack.c:814
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
+
+#: fetch-pack.c:822
+msgid "protocol error: bad pack header"
+msgstr "error de protocolo: mal paquete de header"
+
+#: fetch-pack.c:878
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no se puede quitar %s"
+
+#: fetch-pack.c:894
+#, c-format
+msgid "%s failed"
+msgstr "%s fallo"
+
+#: fetch-pack.c:896
+msgid "error in sideband demultiplexer"
+msgstr "error en demultiplexor de banda lateral"
+
+#: fetch-pack.c:923
+msgid "Server does not support shallow clients"
+msgstr "Servidor no soporta clientes superficiales"
+
+#: fetch-pack.c:927
+msgid "Server supports multi_ack_detailed"
+msgstr "Servidor soporta ulti_ack_detailed"
+
+#: fetch-pack.c:930
+msgid "Server supports no-done"
+msgstr "Servidor soporta no-done"
+
+#: fetch-pack.c:936
+msgid "Server supports multi_ack"
+msgstr "Servidor soporta multi_ack"
+
+#: fetch-pack.c:940
+msgid "Server supports side-band-64k"
+msgstr "Servidor soporta side-band-64k"
+
+#: fetch-pack.c:944
+msgid "Server supports side-band"
+msgstr "Servidor soporta side-band"
+
+#: fetch-pack.c:948
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Servidor soporta allow-tip-sha1-in-want"
+
+#: fetch-pack.c:952
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Servidor soporta allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:962
+msgid "Server supports ofs-delta"
+msgstr "Servidor soporta ofs-delta"
+
+#: fetch-pack.c:969
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Version de servidor es %.*s"
+
+#: fetch-pack.c:975
+msgid "Server does not support --shallow-since"
+msgstr "Servidor no soporta --shalow-since"
+
+#: fetch-pack.c:979
+msgid "Server does not support --shallow-exclude"
+msgstr "Servidor no soporta --shalow-exclude"
+
+#: fetch-pack.c:981
+msgid "Server does not support --deepen"
+msgstr "Servidor no soporta --deepen"
+
+#: fetch-pack.c:992
+msgid "no common commits"
+msgstr "no hay commits comunes"
+
+#: fetch-pack.c:1004
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: fetch fallo"
+
+#: fetch-pack.c:1166
+msgid "no matching remote head"
+msgstr "no concuerda el head remoto"
+
+#: fetch-pack.c:1188
+#, c-format
+msgid "no such remote ref %s"
+msgstr "no existe ref remota %s"
+
+#: fetch-pack.c:1191
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Servidor no permite solicitudes de objetos inadvertidos %s"
+
+#: gpg-interface.c:181
+msgid "gpg failed to sign the data"
+msgstr "gpg fallo al firmar la data"
+
+#: gpg-interface.c:211
+msgid "could not create temporary file"
+msgstr "no se pudo crear archivo temporal"
+
+#: gpg-interface.c:214
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "fallo al escribir la firma separada para '%s'"
+
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ignora color invalido '%.*s' en log.graphColors"
+
+#: grep.c:1970
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': no es posible leer %s"
+
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "fallo al marcar '%s'"
+
+#: grep.c:1998
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': lectura corta"
+
+#: help.c:179
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "comandos disponibles de git en '%s'"
+
+#: help.c:186
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
+
+#: help.c:217
+msgid "These are common Git commands used in various situations:"
+msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
+
+#: help.c:281
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' parece ser un commando de git, pero no hemos\n"
+"podido ejecutarlo. Tal vez git-%s se ha roto?"
+
+#: help.c:336
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oh oh. Tu sistema no reporta ningun comando de Git"
+
+#: help.c:358
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
+
+#: help.c:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuando asumiendo que quisiste decir '%s'."
+
+#: help.c:368
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
+
+#: help.c:376
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s'no es un commando de git. Mira 'git --help'."
+
+#: help.c:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"El comando mas similar es"
+msgstr[1] ""
+"\n"
+"Los comandos mas similares son"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<opciones>]"
+
+#: help.c:456
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:460
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Quisiste decir esto?"
+msgstr[1] ""
+"\n"
+"Quisiste decir alguno de estos?"
+
+#: ident.c:342
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Por favor cuentame quien eres.\n"
+"\n"
+"Corre\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Tu Nombre\"\n"
+"\n"
+"para configurar la identidad por defecto de tu cuenta.\n"
+"Omite --global para configurar tu identidad solo en este repositorio.\n"
+"\n"
+
+#: ident.c:366
+msgid "no email was given and auto-detection is disabled"
+msgstr "no se entrego ningun email y la deteccion automatica esta desactivada"
+
+#: ident.c:371
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "no es posible auto-detectar la direccion de correo (se obtuvo '%s')"
+
+#: ident.c:381
+msgid "no name was given and auto-detection is disabled"
+msgstr ""
+"no se entreogo ningun nombre y la deteccion automatica esta desactivada"
+
+#: ident.c:387
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
+
+#: ident.c:395
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "no se puede tener un nombre vacio (para <%s>)"
+
+#: ident.c:401
+#, c-format
+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
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato de fecha invalido: %s"
+
+#: lockfile.c:151
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"No se puede crear '%s.lock': %s.\n"
+"\n"
+"Otro proceso git parece estar corriendo en el repositorio, es decir\n"
+"un editor abierto con 'git commit'. Por favor asegurese de que todos los "
+"procesos\n"
+"estan terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
+"puede haber roto el repositorio antes:\n"
+"borra el archivo manualmente para continuar."
+
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "No se pudo crear '%s.lock': %s"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "fallo al leer la cache"
+
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
+msgid "unable to write new index file"
+msgstr "no es posible escribir el archivo indice"
+
+#: merge-recursive.c:235
+msgid "(bad commit)\n"
+msgstr "(mal commit)\n"
+
+#: merge-recursive.c:257 merge-recursive.c:265
+#, c-format
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache fallo para la ruta '%s'"
+
+#: merge-recursive.c:329
+msgid "error building trees"
+msgstr "error construyendo arboles"
+
+#: merge-recursive.c:752
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "fallo al crear la ruta '%s'%s"
+
+#: merge-recursive.c:763
+#, 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
+msgid ": perhaps a D/F conflict?"
+msgstr ": tal vez un conflicto D/F?"
+
+#: merge-recursive.c:786
+#, 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
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "no se puede leer el objeto %s '%s'"
+
+#: merge-recursive.c:830
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "se esperaba blob para %s '%s'"
+
+#: merge-recursive.c:854
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "fallo al abrir '%s': %s"
+
+#: merge-recursive.c:865
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "fallo al crear symlink '%s': %s"
+
+#: merge-recursive.c:870
+#, 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
+msgid "Failed to execute internal merge"
+msgstr "Fallo al ejectura fusion interna"
+
+#: merge-recursive.c:1014
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "No es posible agregar %s a la base de datos"
+
+#: merge-recursive.c:1117
+#, 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 version %s de %s "
+"en el arbol"
+
+#: merge-recursive.c:1122
+#, 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. Version %s de %s "
+"permanece en el arbol"
+
+#: merge-recursive.c:1129
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+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
+#, 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 ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s "
+"permanece en el arbol en %s."
+
+#: merge-recursive.c:1168
+msgid "rename"
+msgstr "renombrar"
+
+#: merge-recursive.c:1168
+msgid "renamed"
+msgstr "renombrado"
+
+#: merge-recursive.c:1225
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
+"renombrar \"%s\"->\"%s\" en \"%s\"%s"
+
+#: merge-recursive.c:1255
+msgid " (left unresolved)"
+msgstr " (dejado sin resolver)"
+
+#: merge-recursive.c:1317
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Adding merged %s"
+msgstr "Agregar %s fusionado"
+
+#: merge-recursive.c:1575 merge-recursive.c:1805
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Agregando más bien como %s"
+
+#: merge-recursive.c:1632
+#, c-format
+msgid "cannot read object %s"
+msgstr "no se pudo leer el objeto %s"
+
+#: merge-recursive.c:1635
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s no es un blob"
+
+#: merge-recursive.c:1704
+msgid "modify"
+msgstr "modificar"
+
+#: merge-recursive.c:1704
+msgid "modified"
+msgstr "modificado"
+
+#: merge-recursive.c:1714
+msgid "content"
+msgstr "contenido"
+
+#: merge-recursive.c:1721
+msgid "add/add"
+msgstr "agregar/agregar"
+
+#: merge-recursive.c:1757
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Saltado %s (fusionado como existente)"
+
+#: merge-recursive.c:1771
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %s"
+
+#: merge-recursive.c:1775 git-submodule.sh:944
+msgid "submodule"
+msgstr "submódulo"
+
+#: merge-recursive.c:1776
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
+
+#: merge-recursive.c:1870
+#, c-format
+msgid "Removing %s"
+msgstr "Eliminando %s"
+
+#: merge-recursive.c:1896
+msgid "file/directory"
+msgstr "archivo/directorio"
+
+#: merge-recursive.c:1902
+msgid "directory/file"
+msgstr "directorio/archivo"
+
+#: merge-recursive.c:1908
+#, 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:1917
+#, c-format
+msgid "Adding %s"
+msgstr "Agregando %s"
+
+#: merge-recursive.c:1954
+msgid "Already up to date!"
+msgstr "¡Ya está actualizado!"
+
+#: merge-recursive.c:1963
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "falló la fusión de los árboles %s y %s"
+
+#: merge-recursive.c:2060
+msgid "Merging:"
+msgstr "Fusionando:"
+
+#: merge-recursive.c:2073
+#, 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:2112
+msgid "merge returned no commit"
+msgstr "la fusión no devolvió ninguna confirmación"
+
+#: merge-recursive.c:2175
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "No se pudo analizar el objeto '%s'"
+
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
+msgid "Unable to write index."
+msgstr "Incapaz de escribir el índice."
+
+#: notes-merge.c:272
+#, 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."
+msgstr ""
+"No has concluido tus notas previas de fusion (%s existe).\n"
+"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
+"confirmar/abortar la fusion previa antes de que puedas comenzar una nueva "
+"nota de fusion."
+
+#: notes-merge.c:279
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No has terminado tus notas de fusion (%s existe)."
+
+#: notes-utils.c:42
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"No se puede realizar commit, notas del arbol no inicializadas o no "
+"referenciadas."
+
+#: notes-utils.c:101
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Mal valor para notes.rewriteMode: '%s'"
+
+#: notes-utils.c:111
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Mal valor para %s: '%s'"
+
+#: object.c:239
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "incapaz de analizar objeto: %s"
+
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes del final del paquete (broken .idx?)"
+
+#: packfile.c:1683
+#, 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
+#, 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
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:592
+#, c-format
+msgid "usage: %s"
+msgstr "uso: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:598
+#, c-format
+msgid "   or: %s"
+msgstr "   o: %s"
+
+#: parse-options.c:601
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:640
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto malformado '%s'"
+
+#: path.c:891
+#, c-format
+msgid "Could not make %s writable by group"
+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 ""
+"Caracter de escape '\\' no permitido como ultimo caracter en el valor attr"
+
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Solo una especificacion 'attr' es permitida."
+
+#: pathspec.c:150
+msgid "attr spec must not be empty"
+msgstr "especificacion attr no puede estar vacia"
+
+#: pathspec.c:193
+#, c-format
+msgid "invalid attribute name %s"
+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  "
+
+#: pathspec.c:265
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"la configuración global de 'literal' para patrones de ruta es incompatible "
+"con las demás configuraciones globales de patrones de ruta"
+
+#: pathspec.c:305
+msgid "invalid parameter for pathspec magic 'prefix'"
+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'"
+
+#: pathspec.c:331
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+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"
+
+#: pathspec.c:428
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' y 'glob' son incompatibles"
+
+#: pathspec.c:441
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' está fuera del repositorio"
+
+#: pathspec.c:515
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (nemotecnico: '%c')"
+
+#: pathspec.c:525
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: magic pathspec no soportado por este comando: %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 ""
+"los strings vacíos como pathspecs serán inválidas en las próximas versiones. "
+"por favor use . si quería hacer coincidir todas las rutas"
+
+#: pathspec.c:595
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
+
+#: pretty.c:962
+msgid "unable to parse --pretty format"
+msgstr "incapaz de analizar el formato --pretty"
+
+#: read-cache.c:1443
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#: read-cache.c:1453
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#: read-cache.c:2316 builtin/merge.c:1046
+#, c-format
+msgid "could not close '%s'"
+msgstr "no se pudo cerrar '%s'"
+
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
+#, c-format
+msgid "could not stat '%s'"
+msgstr "no se pudo definir '%s'"
+
+#: read-cache.c:2407
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "no es posible abrir el directorio de git: %s"
+
+#: read-cache.c:2419
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "no es posible remover el vinculo: %s"
+
+#: refs.c:638
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "No sepudo abrir '%s' para escritura"
+
+#: refs.c:1792
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo remover la referencia %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "no se pudo eliminar la referencia %s: %s"
+
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar la referencia: %s"
+
+#: ref-filter.c:35 wt-status.c:1811
+msgid "gone"
+msgstr "desaparecido"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "adelante %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "detras %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "delante %d, detras %d"
+
+#: ref-filter.c:105
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "formato esperado: %%(color:<color>)"
+
+#: ref-filter.c:107
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "color no reconocido: %%(color:%s)"
+
+#: ref-filter.c:127
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "valor entero esperado refname:lstrip=%s"
+
+#: ref-filter.c:131
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "valor entero esperado refname:rstrip=%s"
+
+#: ref-filter.c:133
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argumento: %s no reconocido %%(%s)"
+
+#: ref-filter.c:173
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) no toma ningún argumento"
+
+#: ref-filter.c:180
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) no toma ningún argumento"
+
+#: ref-filter.c:198
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "%%(trailers) desconocidos, argumento: %s"
+
+#: ref-filter.c:221
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positivo esperado contents:lines=%s"
+
+#: ref-filter.c:223
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "argumento %s no reconocido %%(contents)"
+
+#: ref-filter.c:236
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valor positivo esperado objectname:short=%s"
+
+#: ref-filter.c:240
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "argumento: %s no reconocido %%(objectname)"
+
+#: ref-filter.c:267
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato esperado: %%(align:<ancho>,<posición>)"
+
+#: ref-filter.c:279
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posición desconocida: %s"
+
+#: ref-filter.c:283
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "ancho desconocido: %s"
+
+#: ref-filter.c:289
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "argumento no reconocido para %%(align): %s"
+
+#: ref-filter.c:293
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "se esperaba un ancho positivo con el átomo %%(align)"
+
+#: ref-filter.c:308
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argumento: %s no reconocido %%(if)"
+
+#: ref-filter.c:398
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nombre malformado de campo: %.*s"
+
+#: ref-filter.c:424
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nombre de campo desconocido: %.*s"
+
+#: ref-filter.c:536
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "formato: atomo %%(if) usado sin un atomo %%(then)"
+
+#: ref-filter.c:596
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "formato: atomo %%(then) usado sin atomo %%(if)"
+
+#: ref-filter.c:598
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: atomo %%(then) usado mas de una vez"
+
+#: ref-filter.c:600
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: atomo %%(then) usado despues de %%(else)"
+
+#: ref-filter.c:626
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "formato: atomo %%(else) usado sin un atomo %%(if)"
+
+#: ref-filter.c:628
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "formato: atomo %%(else) usado sin un atomo %%(then) "
+
+#: ref-filter.c:630
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: atomo %%(else) usado mas de una vez"
+
+#: ref-filter.c:643
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: atomo %%(end) usado sin atomo correspondiente"
+
+#: ref-filter.c:698
+#, c-format
+msgid "malformed format string %s"
+msgstr "formato de cadena malformado %s"
+
+#: ref-filter.c:1283
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(no hay rama, rebasando %s)"
+
+#: ref-filter.c:1286
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(no hay rama, comenzando bisectado en %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1294
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desascoplado en %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1301
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desacoplado de %s)"
+
+#: ref-filter.c:1305
+msgid "(no branch)"
+msgstr "(sin rama)"
+
+#: ref-filter.c:1454 ref-filter.c:1485
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objeto %s faltante para %s"
+
+#: ref-filter.c:1457 ref-filter.c:1488
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer falló en %s para %s"
+
+#: ref-filter.c:1788
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objeto malformado en '%s'"
+
+#: ref-filter.c:1855
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorando referencia con nombre roto %s"
+
+#: ref-filter.c:1860
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#: ref-filter.c:2122
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: falta atomo %%(end)"
+
+#: ref-filter.c:2216
+#, c-format
+msgid "malformed object name %s"
+msgstr "nombre de objeto malformado %s"
+
+#: remote.c:750
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "No se pueden traer ambos %s y %s a %s"
+
+#: remote.c:754
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s por lo general hace seguimiento a %s, no a %s"
+
+#: remote.c:758
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hace seguimiento tanto a %s como a %s"
+
+#: remote.c:766
+msgid "Internal error"
+msgstr "Error interno"
+
+#: remote.c:1681 remote.c:1783
+msgid "HEAD does not point to a branch"
+msgstr "HEAD no apunta a ninguna rama"
+
+#: remote.c:1690
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "no existe tal rama: '%s'"
+
+#: remote.c:1693
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "no se ha configurado upstream para la rama '%s'"
+
+#: remote.c:1699
+#, 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:1714
+#, 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:1726
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la rama '%s' no tiene remoto para enviar"
+
+#: remote.c:1737
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "refspecs del push para '%s' no incluyen '%s'"
+
+#: remote.c:1750
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "push no tiene destino (push.default es 'nada')"
+
+#: remote.c:1772
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "no se puede resolver push 'simple' para un destino unico"
+
+#: remote.c:2076
+#, 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"
+
+#: remote.c:2080
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
+
+#: remote.c:2083
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Tu rama está actualizada con '%s'.\n"
+
+#: remote.c:2087
+#, 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 confirmación.\n"
+msgstr[1] "Tu rama está adelantada a '%s' por %d confirmaciones.\n"
+
+#: remote.c:2093
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (usa \"git push\" para publicar tus confirmaciones locales)\n"
+
+#: remote.c:2096
+#, 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] ""
+"Tu rama está detrás de '%s' por %d confirmación, y puede ser avanzada "
+"rápido.\n"
+msgstr[1] ""
+"Tu rama está detrás de '%s' por %d confirmaciones, y puede ser avanzada "
+"rápido.\n"
+
+#: remote.c:2104
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
+
+#: remote.c:2107
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Tu rama y '%s' han divergido,\n"
+"y se tiene %d y %d commit diferentes en cada una respectivamente.\n"
+msgstr[1] ""
+"Tu rama y '%s' han divergido,\n"
+"y tienen %d y %d commits diferentes cada una respectivamente.\n"
+
+#: remote.c:2117
+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:2256
+msgid "your current branch appears to be broken"
+msgstr "tu rama actual parece estar rota"
+
+#: revision.c:2259
+#, 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:2453
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent es incompatible con --bisect"
+
+#: run-command.c:644
+msgid "open /dev/null failed"
+msgstr "falló al abrir /dev/null"
+
+#: send-pack.c:151
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
+
+#: send-pack.c:153
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "desempaquetado remoto falló: %s"
+
+#: send-pack.c:316
+msgid "failed to sign the push certificate"
+msgstr "falló al firmar el certificado de push"
+
+#: send-pack.c:429
+msgid "the receiving end does not support --signed push"
+msgstr "el final receptor no soporta --signed push"
+
+#: send-pack.c:431
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"no se manda un certificado de push ya que el destino no soporta push firmado "
+"(--signed )"
+
+#: send-pack.c:443
+msgid "the receiving end does not support --atomic push"
+msgstr "el destino no soporta push atómicos (--atomic)"
+
+#: send-pack.c:448
+msgid "the receiving end does not support push options"
+msgstr "el destino no soporta opciones de push"
+
+#: sequencer.c:218
+msgid "revert"
+msgstr "revertir"
+
+#: sequencer.c:220
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:222
+msgid "rebase -i"
+msgstr "rebase -i"
+
+#: sequencer.c:224
+#, c-format
+msgid "Unknown action: %d"
+msgstr "Accion desconocida: %d"
+
+#: sequencer.c:281
+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"
+"con 'git add <rutas>' o 'git rm <rutas>'"
+
+#: sequencer.c:284
+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 ""
+"tras resolver los conflictos, marca las rutas corregidas\n"
+"con 'git add <rutas>' o 'git rm <rutas>'\n"
+"y haz un commit del resultado con 'git commit'"
+
+#: sequencer.c:297 sequencer.c:1704
+#, c-format
+msgid "could not lock '%s'"
+msgstr "No se pudo bloquear '%s'"
+
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
+#, c-format
+msgid "could not write to '%s'"
+msgstr "No se pudo escribir en '%s'"
+
+#: sequencer.c:304
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "No se pudo escribir EOL en '%s'"
+
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "Fallo al finalizar '%s'."
+
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
+#, c-format
+msgid "could not read '%s'"
+msgstr "No se pudo leer '%s'"
+
+#: sequencer.c:358
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "Tus cambios locales seran sobreescritos por %s."
+
+#: sequencer.c:362
+msgid "commit your changes or stash them to proceed."
+msgstr "Realiza un commit con tus cambios o aplica un stash para proceder."
+
+#: sequencer.c:391
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avance rápido"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:474
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Incapaz de escribir el nuevo archivo índice"
+
+#: sequencer.c:493
+msgid "could not resolve HEAD commit\n"
+msgstr "No se pudo resolver el commit de HEAD\n"
+
+#: sequencer.c:513
+msgid "unable to update cache tree\n"
+msgstr "no es posible actualizar el árbol de la caché\n"
+
+#: sequencer.c:597
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"se ha aplicado un stage a los cambios en el arbol de trabajo\n"
+"si estos cambios estan destinados a ser aplastados en el commit previo, "
+"ejecuta:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Si estos cambios estan destinados a un nuevo commit, ejecuta:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"en cambos casos, cuando acabes, continua con:\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:699
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "No se pudo analizar commit %s.\n"
+
+#: sequencer.c:704
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "No se pudo analizar el commit padre %s\n"
+
+#: sequencer.c:826
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"1ra línea del mensaje squash no esperada:\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:832
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"1ra línea del mensaje squash inválida:\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:838 sequencer.c:863
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Esta es una combinacion de %d commits."
+
+#: sequencer.c:847 sequencer.c:2681
+msgid "need a HEAD to fixup"
+msgstr "se necesita un HEAD para arreglar"
+
+#: sequencer.c:849
+msgid "could not read HEAD"
+msgstr "no se pudo leer HEAD"
+
+#: sequencer.c:851
+msgid "could not read HEAD's commit message"
+msgstr "no se pudo leer el mensaje de commit de HEAD"
+
+#: sequencer.c:857
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no se puede escribir '%s'"
+
+#: sequencer.c:866 git-rebase--interactive.sh:446
+msgid "This is the 1st commit message:"
+msgstr "Este es el mensaje de la 1ra confirmación:"
+
+#: sequencer.c:874
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "no se puede leer el mensaje del commit de %s"
+
+#: sequencer.c:881
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "este es el mensaje del commit #%d:"
+
+#: sequencer.c:886
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El mensaje del commit #%d sera saltado: "
+
+#: sequencer.c:891
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando desconocido: %d"
+
+#: sequencer.c:957
+msgid "your index file is unmerged."
+msgstr "tu archivo indice no esta fusionado."
+
+#: sequencer.c:975
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "el commit %s es una fusion pero no se entrego la opcion -m."
+
+#: sequencer.c:983
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "el commit %s no tiene un padre %d"
+
+#: sequencer.c:987
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "linea principal especificada pero el commit %s no es una fusion."
+
+#: sequencer.c:993
+#, 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:1014
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: no se puede analizar la confirmación padre %s"
+
+#: sequencer.c:1077 sequencer.c:1853
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "No se puede renombrar '%s' a '%s'"
+
+#: sequencer.c:1128
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "no se pudo revertir %s... %s"
+
+#: sequencer.c:1129
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "no se pudo aplicar %s... %s"
+
+#: sequencer.c:1171
+msgid "empty commit set passed"
+msgstr "conjunto de confirmación vacío aprobado"
+
+#: sequencer.c:1181
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: fallo al leer el índice"
+
+#: sequencer.c:1188
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: fallo al refrescar el índice"
+
+#: sequencer.c:1308
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "línea inválida %d: %.*s"
+
+#: sequencer.c:1316
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "no se puede  '%s' sin un commit previo"
+
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:1361
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
+
+#: sequencer.c:1363
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "hoja de instrucciones inutilizable: '%s'"
+
+#: sequencer.c:1368
+msgid "no commits parsed."
+msgstr "ningun commit analizado."
+
+#: sequencer.c:1379
+msgid "cannot cherry-pick during a revert."
+msgstr "no se puede realizar cherry-pick durante un revert."
+
+#: sequencer.c:1381
+msgid "cannot revert during a cherry-pick."
+msgstr "no se puede realizar un revert durante un cherry-pick"
+
+#: sequencer.c:1448
+#, c-format
+msgid "invalid key: %s"
+msgstr "llave invalida: %s"
+
+#: sequencer.c:1451
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valor invalido para %s: %s"
+
+#: sequencer.c:1517
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hoja de opciones mal formada: '%s'"
+
+#: sequencer.c:1555
+msgid "a cherry-pick or revert is already in progress"
+msgstr "un cherry-pick o rever ya esta en progreso"
+
+#: sequencer.c:1556
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:1559
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "no se pudo crear un directorio secuenciador '%s' "
+
+#: sequencer.c:1574
+msgid "could not lock HEAD"
+msgstr "no se pudo bloquear HEAD"
+
+#: sequencer.c:1632 sequencer.c:2211
+msgid "no cherry-pick or revert in progress"
+msgstr "ningun cherry-pick o revert en progreso"
+
+#: sequencer.c:1634
+msgid "cannot resolve HEAD"
+msgstr "no se puede resolver HEAD"
+
+#: sequencer.c:1636 sequencer.c:1671
+msgid "cannot abort from a branch yet to be born"
+msgstr "no se puede abortar de una rama por nacer"
+
+#: sequencer.c:1657 builtin/grep.c:711
+#, c-format
+msgid "cannot open '%s'"
+msgstr "no se puede abrir '%s'"
+
+#: sequencer.c:1659
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "no se puede leer '%s': %s"
+
+#: sequencer.c:1660
+msgid "unexpected end of file"
+msgstr "final de archivo inesperado"
+
+#: sequencer.c:1666
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "archiv HEAD de pre-cherry-pick guardado '%s' esta corrompido"
+
+#: sequencer.c:1677
+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:1818 sequencer.c:2109
+msgid "cannot read HEAD"
+msgstr "no se puede leer HEAD"
+
+#: sequencer.c:1858 builtin/difftool.c:640
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "no se pudo copiar '%s' a '%s'"
+
+#: sequencer.c:1874
+msgid "could not read index"
+msgstr "no se pudo leer indice"
+
+#: sequencer.c:1879
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ejecucion fallida: %s\n"
+"%sse puede arreglar el problema , y luego ejecutar\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1885
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "y se hicieron cambios al indice y/o arbol de trabajo\n"
+
+#: sequencer.c:1891
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"ejecucion exitosa: %s\n"
+"pero todavia quedan cambios para el indice o arbol de trabajo.\n"
+"Realiza un commit o stash con tus cambios, y luego ejecuta\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1948
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#: sequencer.c:1960
+#, c-format
+msgid "cannot store %s"
+msgstr "no se puede guardar %s"
+
+#: sequencer.c:1963 git-rebase.sh:175
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"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"
+"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+"momento.\n"
+
+#: sequencer.c:2045
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Detenido en %s...  %.*s\n"
+
+#: sequencer.c:2087
+#, c-format
+msgid "unknown command %d"
+msgstr "comando desconocido %d"
+
+#: sequencer.c:2117
+msgid "could not read orig-head"
+msgstr "no se puede leer orig-head"
+
+#: sequencer.c:2122 sequencer.c:2678
+msgid "could not read 'onto'"
+msgstr "no se puede leer 'onto'"
+
+#: sequencer.c:2129
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#: sequencer.c:2136
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "no se puede actualizar HEAD a %s"
+
+#: sequencer.c:2220
+msgid "cannot rebase: You have unstaged changes."
+msgstr "no se puede realziar rebase: Tienes cambios fuera del area de stage."
+
+#: sequencer.c:2225
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "no se puede remover CHERRY_PICK_HEAD"
+
+#: sequencer.c:2234
+msgid "cannot amend non-existing commit"
+msgstr "no se puede arreglar un commit no existente"
+
+#: sequencer.c:2236
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "archivo invalido: '%s'"
+
+#: sequencer.c:2238
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenido inválido: '%s'"
+
+#: sequencer.c:2241
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Tienes cambios fuera de un commit en tu arbol de trabajo. Por favor, realiza "
+"un commit con estos\n"
+"primero y luego ejecuta 'git rebase --continue' de nuevo."
+
+#: sequencer.c:2251
+msgid "could not commit staged changes."
+msgstr "no se pudo realiar commit con los cambios en el area de stage."
+
+#: sequencer.c:2331
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: no se puede aplicar cherry-pick a un %s"
+
+#: sequencer.c:2335
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: mala revision"
+
+#: sequencer.c:2368
+msgid "can't revert as initial commit"
+msgstr "no se puede revertir como commit inicial"
+
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: opciones desconocidas"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: error preparando revisiones"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista de pendientes inutilizable: '%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "No se pudo abrir '%s' para escritura"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ingorando."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
+"Commits botados (empezando con el mas nuevo):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Para evitar este mensaje, use \"drop\" para remover de forma explícita un "
+"commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"advertencias.\n"
+"Los posibles comportamientos son: ignore,warn,error.\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "No se pudo analizar commit '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "no se pudo truncar '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "este script ya fue reorganizado."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no se pudo finalizar '%s'"
+
+#: setup.c:171
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: no existe la ruta en el arbol de trabajo.\n"
+"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"localmente."
+
+#: setup.c:184
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
+"trabajo.\n"
+"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+#: setup.c:252
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
+"Use '--' para separar rutas de revisiones, de esta manera:\n"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+#: setup.c:499
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Se esperaba version de git repo  <= %d, encontrada %d"
+
+#: setup.c:507
+msgid "unknown repository extensions found:"
+msgstr "se encontro extension de repositorio desconocida:"
+
+#: setup.c:806
+#, 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"
+
+#: setup.c:808 builtin/index-pack.c:1653
+msgid "Cannot come back to cwd"
+msgstr "No se puede regresar a cwd"
+
+#: setup.c:1046
+msgid "Unable to read current working directory"
+msgstr "Incapaz de leer el directorio de trabajo actual"
+
+#: setup.c:1058 setup.c:1064
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "No se puede cambiar a '%s'"
+
+#: setup.c:1077
+#, c-format
+msgid ""
+"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"
+"Parando en el límite del sistema de archivos "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
+
+#: setup.c:1159
+#, c-format
+msgid ""
+"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"
+"El dueño de los archivos tiene que tener permisos de lectura y escritura."
+
+#: sha1_file.c:528
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ruta '%s' no existe"
+
+#: sha1_file.c:554
+#, 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:560
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositorio de referencia '%s' no es un repositorio local."
+
+#: sha1_file.c:566
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositorio de referencia '%s' es superficial (shallow)"
+
+#: sha1_file.c:574
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositorio de referencia '% s' está injertado"
+
+#: sha1_name.c:420
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "SHA1 %s corta es ambigua"
+
+#: sha1_name.c:431
+msgid "The candidates are:"
+msgstr "Los candidatos son:"
+
+#: sha1_name.c:590
+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"
+"may be created by mistake. For example,\n"
+"\n"
+"  git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
+"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
+"tal vez sean creadas por error. Por ejemplo,\n"
+"\n"
+"  git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"donde \"$br\" est'a de alguna manera vacía y una ref de 40-hex es creada. "
+"Por favor\n"
+"examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
+"ejecutando \"git config advice.objectNameWarning false\""
+
+#: submodule.c:93 submodule.c:127
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
+
+#: submodule.c:97 submodule.c:131
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
+
+#: submodule.c:105
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No se pudo actualizar la entrada %s de .gitmodules"
+
+#: submodule.c:138
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "No se pudo remover la entrada %s de .gitmodules"
+
+#: submodule.c:149
+msgid "staging updated .gitmodules failed"
+msgstr "falló realizar stage a los .gitmodules actualizados"
+
+#: submodule.c:309
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "en el submódulo no poblado '%s'"
+
+#: submodule.c:340
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
+
+#: submodule.c:799
+#, c-format
+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:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Fallo al resolver HEAD como un ref valido."
+
+#: submodule.c:1304
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' no reconocido como un repositorio git"
+
+#: submodule.c:1442
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
+
+#: submodule.c:1455
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
+
+#: submodule.c:1548
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submódulo '%s' tiene un índice corrupto"
+
+#: submodule.c:1809
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
+"soportado"
+
+#: submodule.c:1821 submodule.c:1877
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "no se pudo resolver el nombre para el submódulo '%s'"
+
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no se pudo crear el directorio '%s'"
+
+#: submodule.c:1828
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrando directorio git de '%s%s' desde\n"
+"'%s' hacia\n"
+"'%s'\n"
+
+#: submodule.c:1912
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "No pudo recursar en el submódulo '%s'"
+
+#: submodule.c:1956
+msgid "could not start ls-files in .."
+msgstr "no se pudo comenzar ls-files en .."
+
+#: submodule.c:1976
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG: string de ruta recibido no concuerda con cwd?"
+
+#: submodule.c:1995
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree retornó un código %d inesperado"
+
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:436
+#, c-format
+msgid "invalid value for %s"
+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'"
+
+#: 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 '%s' desconocido para la clave '%s'"
+
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#, c-format
+msgid "more than one %s"
+msgstr "más de un %s"
+
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token de remolque vacío en el trailer '%.*s'"
+
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no se pudo leer el archivo de entrada '%s'"
+
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "no se pudo leer desde stdin"
+
+#: trailer.c:1008 builtin/am.c:46
+#, c-format
+msgid "could not stat %s"
+msgstr "no se pudo definir %s"
+
+#: trailer.c:1010
+#, c-format
+msgid "file %s is not a regular file"
+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 "
+
+#: trailer.c:1024
+msgid "could not open temporary file"
+msgstr "no se pudo abrir el archivo temporal"
+
+#: trailer.c:1064
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "no se pudo renombrar el archivo temporal a %s"
+
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
+
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opción inválida '%s'"
+
+#: transport.c:888
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"La siguiente ruta de submódulo contiene cambios que no\n"
+"pueden ser encontrados en ningún remoto:\n"
+
+#: transport.c:892
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor intenta\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o cd a la ruta y usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para hacer un push al remoto.\n"
+"\n"
+
+#: transport.c:900
+msgid "Aborting."
+msgstr "Abortando."
+
+#: transport-helper.c:1071
+#, c-format
+msgid "Could not read ref %s"
+msgstr "No se pudo leer la referencia %s"
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objeto de arbol muy corto"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "modo mal formado en la entrada de árbol"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nombre de archivo vacío en la entrada de árbol"
+
+#: tree-walk.c:114
+msgid "too-short tree file"
+msgstr "archivo de árbol muy corto"
+
+#: unpack-trees.c:106
+#, 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 "
+"ramas."
+
+#: unpack-trees.c:108
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos seran sobreescritos por "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:111
+#, 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 ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"fusionar:\n"
+"%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar."
+
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos seran sobreescritos por "
+"merge:\n"
+"%%s"
+
+#: unpack-trees.c:116
+#, 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."
+
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos seran sobreescritos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Al actualizar los siguientes directorios se perderán los archivos sin "
+"seguimiento en ellos:\n"
+"%s"
+
+#: unpack-trees.c:127
+#, 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 ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+
+#: unpack-trees.c:129
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos "
+"al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos "
+"al fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al ejecutar %s:\n"
+"%%s"
+
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+
+#: unpack-trees.c:146
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#: unpack-trees.c:149
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#: unpack-trees.c:151
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos no rastreados en el arbol de trabajo seran removidos "
+"por %s:\n"
+"%%s"
+
+#: unpack-trees.c:163
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "Entrda '%s' se superpone con '%s'. No se pueden unir"
+
+#: unpack-trees.c:166
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"No se puede actualizar el sparse checkout: las siguientes entradas no están "
+"actualizadas:\n"
+"%s"
+
+#: unpack-trees.c:168
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
+"actualización sparse checkout:\n"
+"%s"
+
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Los siguientes archivos del árbol de trabajo serán removidos por la "
+"actualización sparse checkout:\n"
+"%s"
+
+#: unpack-trees.c:172
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"No se puede actualizar le submodulo:\n"
+"%s"
+
+#: unpack-trees.c:249
+#, c-format
+msgid "Aborting\n"
+msgstr "Abortando\n"
+
+#: unpack-trees.c:331
+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 '://'"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+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':"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "un 'archivo:' URL puede no tener un número de puerto"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "carácter inválido en el nombre del host"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "numero de puerto invalido"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "segmento de ruta '..' invalido"
+
+#: worktree.c:245
+#, c-format
+msgid "failed to read '%s'"
+msgstr "fallo al leer '%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:766
+#: builtin/am.c:858 builtin/merge.c:1041
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "no se pudo abrir '%s' para lectura"
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr "no es posible acceder '%s'"
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+#: wrapper.c:656
+#, c-format
+msgid "could not write to %s"
+msgstr "no se pudo escribir en %s"
+
+#: wrapper.c:658
+#, c-format
+msgid "could not close %s"
+msgstr "no se pudo cerrar %s"
+
+#: wt-status.c:150
+msgid "Unmerged paths:"
+msgstr "rutas no fusionadas:"
+
+#: wt-status.c:177 wt-status.c:204
+#, c-format
+msgid "  (use \"git reset %s <file>...\" to unstage)"
+msgstr "  (usa \"git reset %s <archivo>...\" para sacar del area de stage)"
+
+#: wt-status.c:179 wt-status.c:206
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del area de stage)"
+
+#: wt-status.c:183
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (usa \"git add <archivo>...\" para marcar una resolucion)"
+
+#: wt-status.c:185 wt-status.c:189
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
+"resolucion)"
+
+#: wt-status.c:187
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (usa \"git rm <file>...\" para marcar la resolucion)"
+
+#: wt-status.c:198 wt-status.c:979
+msgid "Changes to be committed:"
+msgstr "Cambios a ser confirmados:"
+
+#: wt-status.c:216 wt-status.c:988
+msgid "Changes not staged for commit:"
+msgstr "Cambios no rastreados para el commit:"
+
+#: wt-status.c:220
+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
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (usa \"git add/rm <archivo>...\" para actuailzar a lo que se le va a hacer "
+"commit)"
+
+#: wt-status.c:223
+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
+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
+#, 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
+msgid "both deleted:"
+msgstr "ambos borrados:"
+
+#: wt-status.c:254
+msgid "added by us:"
+msgstr "agregado por nosotros:"
+
+#: wt-status.c:256
+msgid "deleted by them:"
+msgstr "borrados por ellso:"
+
+#: wt-status.c:258
+msgid "added by them:"
+msgstr "agregado por ellos:"
+
+#: wt-status.c:260
+msgid "deleted by us:"
+msgstr "borrado por nosotros:"
+
+#: wt-status.c:262
+msgid "both added:"
+msgstr "ambos agregados:"
+
+#: wt-status.c:264
+msgid "both modified:"
+msgstr "ambos modificados:"
+
+#: wt-status.c:274
+msgid "new file:"
+msgstr "nuevo archivo:"
+
+#: wt-status.c:276
+msgid "copied:"
+msgstr "copiado:"
+
+#: wt-status.c:278
+msgid "deleted:"
+msgstr "borrado:"
+
+#: wt-status.c:280
+msgid "modified:"
+msgstr "modificado:"
+
+#: wt-status.c:282
+msgid "renamed:"
+msgstr "renombrado:"
+
+#: wt-status.c:284
+msgid "typechange:"
+msgstr "cambio de tipo:"
+
+#: wt-status.c:286
+msgid "unknown:"
+msgstr "desconocido:"
+
+#: wt-status.c:288
+msgid "unmerged:"
+msgstr "desfusionado:"
+
+#: wt-status.c:370
+msgid "new commits, "
+msgstr "nuevos commits, "
+
+#: wt-status.c:372
+msgid "modified content, "
+msgstr "contenido modificado, "
+
+#: wt-status.c:374
+msgid "untracked content, "
+msgstr "contenido no rastreado, "
+
+#: wt-status.c:819
+#, 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[1] "Tu stash actualmente tiene %d entradas"
+
+#: wt-status.c:851
+msgid "Submodules changed but not updated:"
+msgstr "Submodulos cambiados pero no actualizados:"
+
+#: wt-status.c:853
+msgid "Submodule changes to be committed:"
+msgstr "Submodulos cambiados listos para realizar commit:"
+
+#: wt-status.c:935
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"No modifique o borre la linea de encima.\n"
+"Todo lo que este por abajo será removido."
+
+#: wt-status.c:1048
+msgid "You have unmerged paths."
+msgstr "tienes rutas no fusionadas"
+
+#: wt-status.c:1051
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (arregla los conflictos y corre \"git commit\""
+
+#: wt-status.c:1053
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
+
+#: wt-status.c:1058
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos los conflictos resueltos pero sigues fusionando."
+
+#: wt-status.c:1061
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (usa \"git commit\" para concluir la fusion)"
+
+#: wt-status.c:1071
+msgid "You are in the middle of an am session."
+msgstr "Estas en medio de una sesion am."
+
+#: wt-status.c:1074
+msgid "The current patch is empty."
+msgstr "El parche actual esta vacio."
+
+#: wt-status.c:1078
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
+
+#: wt-status.c:1080
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (usa \"git am --skip\" para saltar este parche)"
+
+#: wt-status.c:1082
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
+
+#: wt-status.c:1214
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo no esta presente."
+
+#: wt-status.c:1216
+msgid "No commands done."
+msgstr "No se realizaron los comandos."
+
+#: wt-status.c:1219
+#, 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):"
+
+#: wt-status.c:1230
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (ver mas en el archivo %s)"
+
+#: wt-status.c:1235
+msgid "No commands remaining."
+msgstr "No quedan mas comandos."
+
+#: wt-status.c:1238
+#, 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="
+
+#: wt-status.c:1246
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
+
+#: wt-status.c:1259
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Estas aplicando un rebase de la rama '%s' en '%s."
+
+#: wt-status.c:1264
+msgid "You are currently rebasing."
+msgstr "Estas aplicando un rebase."
+
+#: wt-status.c:1278
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
+
+#: wt-status.c:1280
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
+
+#: wt-status.c:1282
+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:1288
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
+
+#: wt-status.c:1292
+#, 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 "
+"'%s'."
+
+#: wt-status.c:1297
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Estas dividiendo un commit durante un rebase."
+
+#: wt-status.c:1300
+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:1304
+#, 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 "
+"'%s'."
+
+#: wt-status.c:1309
+msgid "You are currently editing a commit during a rebase."
+msgstr "Estas editando un commit durante un rebase."
+
+#: wt-status.c:1312
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (usa \"git commit --amend\" para enmendar la confirmación actual)"
+
+#: wt-status.c:1314
+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:1324
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Estas realizando un cherry-picking en el commit %s."
+
+#: wt-status.c:1329
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
+
+#: wt-status.c:1332
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
+
+#: wt-status.c:1334
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (use \"git cherry-pick --abort\" para cancelar la operacion cherry-pick)"
+
+#: wt-status.c:1343
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Estas revirtiendo el commit %s."
+
+#: wt-status.c:1348
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
+
+#: wt-status.c:1351
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
+
+#: wt-status.c:1353
+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:1364
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Estas aplicando un bisect, comenzando en la rama '%s'."
+
+#: wt-status.c:1368
+msgid "You are currently bisecting."
+msgstr "Estas aplicando un bisect."
+
+#: wt-status.c:1371
+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:1568
+msgid "On branch "
+msgstr "En la rama "
+
+#: wt-status.c:1574
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interactivo en progreso; en"
+
+#: wt-status.c:1576
+msgid "rebase in progress; onto "
+msgstr "rebase en progreso; en"
+
+#: wt-status.c:1581
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en"
+
+#: wt-status.c:1583
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de"
+
+#: wt-status.c:1586
+msgid "Not currently on any branch."
+msgstr "Actualmente no estás en ninguna rama."
+
+#: wt-status.c:1606
+msgid "Initial commit"
+msgstr "Confirmación inicial"
+
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "No hay commits todavia"
+
+#: wt-status.c:1621
+msgid "Untracked files"
+msgstr "Archivos sin seguimiento"
+
+#: wt-status.c:1623
+msgid "Ignored files"
+msgstr "Archivos ignorados"
+
+#: wt-status.c:1627
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
+"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
+"nuevos archivos usted mismo (vea 'git help status')."
+
+#: wt-status.c:1633
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Archivos no rastreados no son mostrados %s"
+
+#: wt-status.c:1635
+msgid " (use -u option to show untracked files)"
+msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
+
+#: wt-status.c:1641
+msgid "No changes"
+msgstr "Sin cambios"
+
+#: wt-status.c:1646
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"sin cambios agregados a la confirmación (usa \"git add\" y/o \"git commit -a"
+"\")\n"
+
+#: wt-status.c:1649
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "no se agregaron cambios al commit\n"
+
+#: wt-status.c:1652
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hay nada agregado a la confirmación pero hay archivos sin seguimiento "
+"presentes (usa \"git add\" para hacerles seguimiento)\n"
+
+#: wt-status.c:1655
+#, 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:1658
+#, 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:1661 wt-status.c:1666
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nada para hacer commit\n"
+
+#: wt-status.c:1664
+#, 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:1668
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nada para hacer comit, el arbol de trabajo esta limpio\n"
+
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "No hay commits todavia en "
+
+#: wt-status.c:1784
+msgid "HEAD (no branch)"
+msgstr "HEAD (sin rama)"
+
+#: wt-status.c:1813 wt-status.c:1821
+msgid "behind "
+msgstr "detras"
+
+#: wt-status.c:1816 wt-status.c:1819
+msgid "ahead "
+msgstr "adelante"
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2311
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "no se puede %s: Tienes cambios sin marcar."
+
+#: wt-status.c:2317
+msgid "additionally, your index contains uncommitted changes."
+msgstr "adicionalmente, tu indice contiene cambios que no estan en un commit."
+
+#: wt-status.c:2319
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "no se puede %s: Tu indice contiene cambios que no estan en un commit."
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "fallo al desvincular '%s'"
+
+#: builtin/add.c:24
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opcion>] [--] <especificacion-de-ruta>..."
+
+#: builtin/add.c:82
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "diff status inesperado %c"
+
+#: builtin/add.c:87 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "fallo la actualizacion de carpetas"
+
+#: builtin/add.c:97
+#, c-format
+msgid "remove '%s'\n"
+msgstr "remover '%s'\n"
+
+#: builtin/add.c:153
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Cambios fuera del área de stage tras refrescar el índice:"
+
+#: builtin/add.c:213 builtin/rev-parse.c:888
+msgid "Could not read the index"
+msgstr "No se pudo leer el indice"
+
+#: builtin/add.c:224
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "No se pudo abrir '%s' para escritura."
+
+#: builtin/add.c:228
+msgid "Could not write patch"
+msgstr "No se puede escribir el parche"
+
+#: builtin/add.c:231
+msgid "editing patch failed"
+msgstr "fallo la edicion del parche"
+
+#: builtin/add.c:234
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "No se pudo definir '%s'"
+
+#: builtin/add.c:236
+msgid "Empty patch. Aborted."
+msgstr "Parche vacio. Abortado."
+
+#: builtin/add.c:241
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "No se pudo aplicar '%s'"
+
+#: builtin/add.c:251
+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: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
+msgid "dry run"
+msgstr "dry run ( ejecucion en seco)"
+
+#: builtin/add.c:274
+msgid "interactive picking"
+msgstr "seleccion interactiva"
+
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
+msgid "select hunks interactively"
+msgstr "elegir hunks de forma interactiva"
+
+#: builtin/add.c:276
+msgid "edit current diff and apply"
+msgstr "editar diff actual y aplicar"
+
+#: builtin/add.c:277
+msgid "allow adding otherwise ignored files"
+msgstr "permitir agregar caso contrario ignorar archivos"
+
+#: builtin/add.c:278
+msgid "update tracked files"
+msgstr "actualizado las carpetas rastreadas"
+
+#: builtin/add.c:279
+msgid "record only the fact that the path will be added later"
+msgstr "grabar solo el hecho de que la ruta será agregada después"
+
+#: builtin/add.c:280
+msgid "add changes from all tracked and untracked files"
+msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
+
+#: builtin/add.c:283
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ignorar rutas removidas en el arbol de trabajo (lo mismo que --no-all)"
+
+#: builtin/add.c:285
+msgid "don't add, only refresh the index"
+msgstr "no agregar, solo actualizar el indice"
+
+#: builtin/add.c:286
+msgid "just skip files which cannot be added because of errors"
+msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
+
+#: builtin/add.c:287
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
+
+#: builtin/add.c:288 builtin/update-index.c:954
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:288 builtin/update-index.c:955
+msgid "override the executable bit of the listed files"
+msgstr "sobrescribir el bit ejecutable de los archivos listados"
+
+#: builtin/add.c:290
+msgid "warn when adding an embedded repository"
+msgstr "avisar cuando se agrega un repositorio incrustado"
+
+#: builtin/add.c:305
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
+"Clones del repositorio exterior no tendran el contenido del \n"
+"repositorio embebido y no sabran como obtenerla.\n"
+"Si queria agregar un submodulo, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Si se agrego esta ruta por error, puede removerla desde el indice \n"
+"usando:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Vea \"git help submodule\" para mas informacion."
+
+#: builtin/add.c:333
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "agregando repositorio embebido: %s"
+
+#: builtin/add.c:351
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Use -f si realmente quiere agregarlos.\n"
+
+#: builtin/add.c:359
+msgid "adding files failed"
+msgstr "fallo al agregar archivos"
+
+#: builtin/add.c:396
+msgid "-A and -u are mutually incompatible"
+msgstr "-A y -u son mutuamente incompatibles"
+
+#: builtin/add.c:403
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
+
+#: builtin/add.c:407
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
+
+#: builtin/add.c:422
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nada especificado, nada agregado.\n"
+
+#: builtin/add.c:423
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Tal vez quiso decir '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
+msgid "index file corrupt"
+msgstr "archivo indice corrompido"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "no se pudo analizar el script del autor"
+
+#: builtin/am.c:498
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' fue borrado por el hook de applypatch-msg"
+
+#: builtin/am.c:539
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "linea mal formada: '%s'."
+
+#: builtin/am.c:576
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Fallo al copiar notas de '%s' a '%s'"
+
+#: builtin/am.c:602
+msgid "fseek failed"
+msgstr "fall de fseek"
+
+#: builtin/am.c:786
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "no se pudo analizar el parche '%s'"
+
+#: builtin/am.c:851
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Solo un parche StGIT puede ser aplicado de una vez "
+
+#: builtin/am.c:899
+msgid "invalid timestamp"
+msgstr "timestamp invalido"
+
+#: builtin/am.c:904 builtin/am.c:916
+msgid "invalid Date line"
+msgstr "linea Date invalida"
+
+#: builtin/am.c:911
+msgid "invalid timezone offset"
+msgstr "offset de zona horaria inválido"
+
+#: builtin/am.c:1004
+msgid "Patch format detection failed."
+msgstr "Falló al detectar el formato del parche."
+
+#: builtin/am.c:1009 builtin/clone.c:402
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "fallo al crear el directorio '%s'"
+
+#: builtin/am.c:1013
+msgid "Failed to split patches."
+msgstr "Fallo al dividir parches"
+
+#: builtin/am.c:1142 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "no es posible escribir en el archivo indice"
+
+#: builtin/am.c:1193
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
+
+#: builtin/am.c:1194
+#, 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:1195
+#, 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:1302
+msgid "Patch is empty."
+msgstr "El parche esta vacio."
+
+#: builtin/am.c:1368
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "sangría no válida: %.*s"
+
+#: builtin/am.c:1390
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no es posible analizar el commit %s"
+
+#: builtin/am.c:1584
+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"
+
+#: builtin/am.c:1586
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Usando la información del índice para reconstruir un árbol base..."
+
+#: builtin/am.c:1605
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Editaste el parche a mano?\n"
+"No aplica a blobs guardados en su índice."
+
+#: builtin/am.c:1611
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Retrocediento para parchar base y fusión de 3-vías..."
+
+#: builtin/am.c:1636
+msgid "Failed to merge in the changes."
+msgstr "Falló al fusionar en los cambios."
+
+#: builtin/am.c:1660 builtin/merge.c:641
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falló al escribir el árbol"
+
+#: builtin/am.c:1667
+msgid "applying to an empty history"
+msgstr "aplicando a un historial vacio"
+
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
+msgid "failed to write commit object"
+msgstr "fallo al escribir el objeto commit"
+
+#: builtin/am.c:1713 builtin/am.c:1717
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "no se puede continuar: %s no existe"
+
+#: builtin/am.c:1733
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "no se puede ser interactivo sin stdin conectado a un terminal"
+
+#: builtin/am.c:1738
+msgid "Commit Body is:"
+msgstr "Cuerpo de commit es:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1748
+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:1798
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "�ndice sucio: no se puede aplicar parches (sucio: %s)"
+
+#: builtin/am.c:1838 builtin/am.c:1910
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Aplicando: %.*s"
+
+#: builtin/am.c:1854
+msgid "No changes -- Patch already applied."
+msgstr "Sin cambios -- parche ya aplicado."
+
+#: builtin/am.c:1862
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "El parche fallo en %s %.*s"
+
+#: builtin/am.c:1868
+#, 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:1913
+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 ""
+"Sin cambios - olvidaste usar 'git add'?\n"
+"Si no hay nada en el area de stage, las posibilidad es que algo mas\n"
+"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
+
+#: builtin/am.c:1920
+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 might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"Todavía tiene rutas sin fusionar en su índice.\n"
+"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
+"como tal.\n"
+"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
+"él."
+
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "No se pudo analizar el objeto '%s'."
+
+#: builtin/am.c:2081
+msgid "failed to clean index"
+msgstr "fallo al limpiar el indice"
+
+#: builtin/am.c:2116
+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 "
+
+#: builtin/am.c:2179
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "valor invalido para --patch-format: %s"
+
+#: builtin/am.c:2212
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
+
+#: builtin/am.c:2213
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opciones>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2219
+msgid "run interactively"
+msgstr "ejecutar de manera interactiva"
+
+#: builtin/am.c:2221
+msgid "historical option -- no-op"
+msgstr "opcion historica -- no-op"
+
+#: builtin/am.c:2223
+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:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
+msgid "be quiet"
+msgstr "ser silencioso"
+
+#: builtin/am.c:2226
+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:2229
+msgid "recode into utf8 (default)"
+msgstr "recodificar en utf8 (default)"
+
+#: builtin/am.c:2231
+msgid "pass -k flag to git-mailinfo"
+msgstr "pasar flag -k a git-mailinfo"
+
+#: builtin/am.c:2233
+msgid "pass -b flag to git-mailinfo"
+msgstr "pasar flag -b a git-mailinfo"
+
+#: builtin/am.c:2235
+msgid "pass -m flag to git-mailinfo"
+msgstr "pasar flag -m a git-mailinfo"
+
+#: builtin/am.c:2237
+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:2240
+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:2243
+msgid "strip everything before a scissors line"
+msgstr "descubrir todo antes de una línea de tijeras"
+
+#: 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
+msgid "pass it through git-apply"
+msgstr "pasarlo 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
+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
+msgid "format"
+msgstr "formato"
+
+#: builtin/am.c:2269
+msgid "format the patch(es) are in"
+msgstr "formatear el parche(s)"
+
+#: builtin/am.c:2275
+msgid "override error message when patch failure occurs"
+msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
+
+#: builtin/am.c:2277
+msgid "continue applying patches after resolving a conflict"
+msgstr "continuar aplicando los parches tras resolver conflictos"
+
+#: builtin/am.c:2280
+msgid "synonyms for --continue"
+msgstr "sinonimos para --continue"
+
+#: builtin/am.c:2283
+msgid "skip the current patch"
+msgstr "saltar el parche actual"
+
+#: builtin/am.c:2286
+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:2290
+msgid "lie about committer date"
+msgstr "mentir sobre la fecha del committer"
+
+#: builtin/am.c:2292
+msgid "use current timestamp for author date"
+msgstr "usar el timestamp actual para la fecha del 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
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/am.c:2295
+msgid "GPG-sign commits"
+msgstr "commits con firma GPG"
+
+#: builtin/am.c:2298
+msgid "(internal use for git-rebase)"
+msgstr "(uso interno para git-rebase)"
+
+#: builtin/am.c:2316
+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 ""
+"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:2323
+msgid "failed to read the index"
+msgstr "fallo al leer el indice"
+
+#: builtin/am.c:2338
+#, 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:2362
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Directorio extraviado %s encontrado.\n"
+"Use \"git am --abort\" para borrarlo."
+
+#: builtin/am.c:2368
+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>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "no se pudo crear el archivo comprimido '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "no se pudo redireccionar la salida"
+
+#: builtin/archive.c:37
+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"
+
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
+msgstr "git archive: error de protocolo"
+
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
+msgstr "git archive: se esperaba un flush"
+
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
+msgstr "realiza 'git bisect next'"
+
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
+
+#: builtin/blame.c:27
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
+
+#: builtin/blame.c:32
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<rev-opts> estan documentadas en git-rev-list(1)"
+
+#: builtin/blame.c:668
+msgid "Show blame entries as we find them, incrementally"
+msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
+
+#: builtin/blame.c:669
+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
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "No tratar commits raíces como extremos (Default: off)"
+
+#: builtin/blame.c:671
+msgid "Show work cost statistics"
+msgstr "Mostrar estadisticas de costo de trabajo"
+
+#: builtin/blame.c:672
+msgid "Force progress reporting"
+msgstr "Forzar el reporte de progreso"
+
+#: builtin/blame.c:673
+msgid "Show output score for blame entries"
+msgstr "Mostrar la puntuación de salida de las entradas de blame"
+
+#: builtin/blame.c:674
+msgid "Show original filename (Default: auto)"
+msgstr "Mostrar nombre original del archivo (Default: auto)"
+
+#: builtin/blame.c:675
+msgid "Show original linenumber (Default: off)"
+msgstr "Mostrar número de línea original (Default: off)"
+
+#: builtin/blame.c:676
+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
+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
+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
+msgid "Show raw timestamp (Default: off)"
+msgstr "Mostrar timestamp en formato raw (Default: off)"
+
+#: builtin/blame.c:680
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
+
+#: builtin/blame.c:681
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "Suprimir nombre del autor y timestamp (Default: off)"
+
+#: builtin/blame.c:682
+msgid "Show author email instead of name (Default: off)"
+msgstr "Mostrar en cambio el email del autor (Default: off)"
+
+#: builtin/blame.c:683
+msgid "Ignore whitespace differences"
+msgstr "Ignorar diferencias de espacios en blanco"
+
+#: builtin/blame.c:690
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Usar un heurístico experimental para mejorar los diffs"
+
+#: builtin/blame.c:692
+msgid "Spend extra cycles to find better match"
+msgstr "Ocupo más ciclos para encontrar mejoras resultados"
+
+#: builtin/blame.c:693
+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
+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
+msgid "score"
+msgstr "puntaje"
+
+#: builtin/blame.c:695
+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
+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
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:697
+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
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
+msgid "4 years, 11 months ago"
+msgstr "hace 4 años, 11 meses"
+
+#: builtin/blame.c:882
+#, 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
+msgid "Blaming lines"
+msgstr "Blaming a líneas"
+
+#: builtin/branch.c:27
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:28
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..."
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opciones>] [-r | -a] [--formato]"
+
+#: builtin/branch.c:146
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"borrando la rama '%s' que ha sido fusionada en\n"
+"         '%s', pero aún no ha sido fusionada a HEAD."
+
+#: builtin/branch.c:150
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"no borrando rama '%s' que todavía no ha sido fusionada \n"
+"\ta '%s', aunque se fusione con HEAD."
+
+#: builtin/branch.c:164
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "No se pudo encontrar el objeto commit para '%s'"
+
+#: builtin/branch.c:168
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"La rama '%s' no ha sido fusionada completamente.\n"
+"Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
+
+#: builtin/branch.c:181
+msgid "Update of config-file failed"
+msgstr "Fallo de actualizacion de config-file"
+
+#: builtin/branch.c:212
+msgid "cannot use -a with -d"
+msgstr "no se puede usar-a con -d"
+
+#: builtin/branch.c:218
+msgid "Couldn't look up commit object for HEAD"
+msgstr "No se pudo revisar el objeto commit para HEAD"
+
+#: builtin/branch.c:232
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
+
+#: builtin/branch.c:247
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "rama de rastreo remoto '%s' no encontrada."
+
+#: builtin/branch.c:248
+#, c-format
+msgid "branch '%s' not found."
+msgstr "rama '%s' no encontrada."
+
+#: builtin/branch.c:263
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Error al eliminar la rama de rastreo remota '%s'"
+
+#: builtin/branch.c:264
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "Error al eliminar la rama '%s'"
+
+#: builtin/branch.c:271
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
+
+#: builtin/branch.c:272
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Eliminada la rama %s (era %s)..\n"
+
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no es posible analizar el string de formato"
+
+#: builtin/branch.c:450
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Rama %s está siendo rebasada en %s"
+
+#: builtin/branch.c:454
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Rama %s está siendo bisecada en %s"
+
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
+
+#: builtin/branch.c:472
+msgid "cannot rename the current branch while not on any."
+msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
+
+#: builtin/branch.c:483
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nombre de rama invalido: '%s'"
+
+#: builtin/branch.c:504
+msgid "Branch rename failed"
+msgstr "Cambio de nombre de rama fallido"
+
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Copiado de rama fallido"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Copiada una rama mal llamada '%s' afuera"
+
+#: builtin/branch.c:513
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Rama mal llamada '%s' renombrada"
+
+#: builtin/branch.c:519
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
+
+#: builtin/branch.c:528
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+"La rama está renombrada, pero falló la actualización del archivo de "
+"configuración"
+
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La rama está copiada, pero falló la actualización del archivo de "
+"configuración"
+
+#: builtin/branch.c:546
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Por favor, edita la descripción para la rama\n"
+"%s\n"
+"Las líneas que comiencen con '%c' serán removidas.\n"
+
+#: builtin/branch.c:579
+msgid "Generic options"
+msgstr "Opciones genericas"
+
+#: builtin/branch.c:581
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "mostrar hash y tema, dar dos veces para rama upstream"
+
+#: builtin/branch.c:582
+msgid "suppress informational messages"
+msgstr "Suprimir mensajes informativos"
+
+#: builtin/branch.c:583
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "configurando modo tracking (mirar git-pull(1))"
+
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "no usar"
+
+#: builtin/branch.c:587
+msgid "upstream"
+msgstr "upstream"
+
+#: builtin/branch.c:587
+msgid "change the upstream info"
+msgstr "cambiar info de upstream"
+
+#: builtin/branch.c:588
+msgid "Unset the upstream info"
+msgstr "Desconfigurando la info de upstream"
+
+#: builtin/branch.c:589
+msgid "use colored output"
+msgstr "usar salida con colores"
+
+#: builtin/branch.c:590
+msgid "act on remote-tracking branches"
+msgstr "actuar en ramas de traqueo remoto"
+
+#: builtin/branch.c:592 builtin/branch.c:594
+msgid "print only branches that contain the commit"
+msgstr "mostrar solo ramas que contienen el commit"
+
+#: builtin/branch.c:593 builtin/branch.c:595
+msgid "print only branches that don't contain the commit"
+msgstr "mostrar solo ramas que no contienen el commit"
+
+#: builtin/branch.c:598
+msgid "Specific git-branch actions:"
+msgstr "Acciones específicas de git-branch:"
+
+#: builtin/branch.c:599
+msgid "list both remote-tracking and local branches"
+msgstr "listar ramas de remote-tracking y locales"
+
+#: builtin/branch.c:601
+msgid "delete fully merged branch"
+msgstr "borrar ramas totalmente fusionadas"
+
+#: builtin/branch.c:602
+msgid "delete branch (even if not merged)"
+msgstr "borar rama (incluso si no esta fusionada)"
+
+#: builtin/branch.c:603
+msgid "move/rename a branch and its reflog"
+msgstr "mover/renombrar una rama y su reflog"
+
+#: builtin/branch.c:604
+msgid "move/rename a branch, even if target exists"
+msgstr "mover/renombrar una rama, incluso si el destino existe"
+
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copiar una rama y su reflog"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copiar una rama, incluso si el objetivo existe"
+
+#: builtin/branch.c:607
+msgid "list branch names"
+msgstr "listar nombres de ramas"
+
+#: builtin/branch.c:608
+msgid "create the branch's reflog"
+msgstr "crea el reflog de la rama"
+
+#: builtin/branch.c:610
+msgid "edit the description for the branch"
+msgstr "edita la descripcion de la rama"
+
+#: builtin/branch.c:611
+msgid "force creation, move/rename, deletion"
+msgstr "fuerza la creacion,movimiento/renombrado,borrado"
+
+#: builtin/branch.c:612
+msgid "print only branches that are merged"
+msgstr "muestra solo ramas que han sido fusionadas"
+
+#: builtin/branch.c:613
+msgid "print only branches that are not merged"
+msgstr "muestra solo ramas que no han sido fusionadas"
+
+#: builtin/branch.c:614
+msgid "list branches in columns"
+msgstr "muestra las ramas en columnas"
+
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
+msgid "key"
+msgstr "clave"
+
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
+msgid "field name to sort on"
+msgstr "nombre del campo por el cuál 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
+msgid "object"
+msgstr "objeto"
+
+#: builtin/branch.c:619
+msgid "print only branches of the object"
+msgstr "imprimir sólo las ramas del objeto"
+
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
+msgid "sorting and filtering are case insensitive"
+msgstr "ordenamiento y filstrado son case-insensitive"
+
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "formato para usar para el output"
+
+#: builtin/branch.c:645 builtin/clone.c:729
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD no encontrado abajo de refs/heads!"
+
+#: builtin/branch.c:668
+msgid "--column and --verbose are incompatible"
+msgstr "--column y --verbose son incompatibles"
+
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
+msgid "branch name required"
+msgstr "se necesita el nombre de la rama"
+
+#: builtin/branch.c:708
+msgid "Cannot give description to detached HEAD"
+msgstr "No se puede dar descripción al HEAD desacoplado"
+
+#: builtin/branch.c:713
+msgid "cannot edit description of more than one branch"
+msgstr "no se puede editar la descripción de más de una rama"
+
+#: builtin/branch.c:720
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Aún no hay confirmaciones en la rama '%s'."
+
+#: builtin/branch.c:723
+#, c-format
+msgid "No branch named '%s'."
+msgstr "No hay ninguna rama llamada '%s'."
+
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "demasiadas ramas para una operación de copiado"
+
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "demasiados argumentos para una operación de renombrado"
+
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "demasiados argumentos para configurar un nuevo upstream"
+
+#: builtin/branch.c:756
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
+"rama."
+
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
+#, c-format
+msgid "no such branch '%s'"
+msgstr "no hay tal rama '%s'"
+
+#: builtin/branch.c:763
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "la rama '%s' no existe"
+
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "demasiados argumentos para desconfigurar upstream"
+
+#: builtin/branch.c:779
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
+"rama."
+
+#: builtin/branch.c:785
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Rama '%s' no tiene informacion de upstream"
+
+#: builtin/branch.c:797
+msgid "it does not make sense to create 'HEAD' manually"
+msgstr "No tiene sentido crear 'HEAD' manualmente"
+
+#: builtin/branch.c:803
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
+
+#: builtin/branch.c:806
+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 '--"
+"set-upstream-to' en cambio."
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s está bien\n"
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "Se necesita un repositorio para agrupar."
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "Se necesita un repositorio para desagrupar."
+
+#: builtin/cat-file.c:521
+msgid ""
+"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 | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
+
+#: builtin/cat-file.c:522
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:559
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<tipo> puede ser: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:560
+msgid "show object type"
+msgstr "mostrar el tipo del objeto"
+
+#: builtin/cat-file.c:561
+msgid "show object size"
+msgstr "mostrar el tamanio del objeto"
+
+#: builtin/cat-file.c:563
+msgid "exit with zero when there's no error"
+msgstr "salir con cero cuando no haya error"
+
+#: builtin/cat-file.c:564
+msgid "pretty-print object's content"
+msgstr "realizar pretty-print del contenido del objeto"
+
+#: builtin/cat-file.c:566
+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
+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:943
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:570
+msgid "use a specific path for --textconv/--filters"
+msgstr "use una ruta específica para --textconv/--filters"
+
+#: builtin/cat-file.c:572
+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
+msgid "buffer --batch output"
+msgstr "salida buffer --batch "
+
+#: builtin/cat-file.c:575
+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
+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
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "seguir symlinks en el árbol (usado con --batch o --batch-check)"
+
+#: builtin/cat-file.c:583
+msgid "show all objects with --batch or --batch-check"
+msgstr "mostrar todos los objetos con --batch o --batch-check"
+
+#: builtin/check-attr.c:12
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
+
+#: builtin/check-attr.c:13
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+
+#: builtin/check-attr.c:20
+msgid "report all attributes set on file"
+msgstr "reportar todos los atributos configurados en el archivo"
+
+#: builtin/check-attr.c:21
+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
+msgid "read file names from stdin"
+msgstr "leer nombres de archivos de stdin"
+
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+msgid "terminate input and output records by a NUL character"
+msgstr "terminar registros de entrada y salida con un caracter NUL"
+
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
+msgid "suppress progress reporting"
+msgstr "suprimir el reporte de progreso"
+
+#: builtin/check-ignore.c:28
+msgid "show non-matching input paths"
+msgstr "mostrar rutas de entrada que no concuerdan"
+
+#: builtin/check-ignore.c:30
+msgid "ignore index when checking"
+msgstr "ignorar el índice cuando se revise"
+
+#: builtin/check-ignore.c:158
+msgid "cannot specify pathnames with --stdin"
+msgstr "no se puede especificar los nombres de rutas con --stdin"
+
+#: builtin/check-ignore.c:161
+msgid "-z only makes sense with --stdin"
+msgstr "-z sólo tiene sentido con --stdin"
+
+#: builtin/check-ignore.c:163
+msgid "no path specified"
+msgstr "ruta no especificada"
+
+#: builtin/check-ignore.c:167
+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
+msgid "cannot have both --quiet and --verbose"
+msgstr "no se puede tener ambos --quiet y --verbose"
+
+#: builtin/check-ignore.c:172
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching sólo es válida con --verbose"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opciones>] <contacto>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "también leer contactos desde stdin"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "no es posible analizar el contacto: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "contactos no especificados"
+
+#: builtin/checkout-index.c:128
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
+
+#: builtin/checkout-index.c:145
+msgid "stage should be between 1 and 3 or all"
+msgstr "stage tiene que estar entre 1 y 3 o all"
+
+#: builtin/checkout-index.c:161
+msgid "check out all files in the index"
+msgstr "revisar todos los archivos en el indice"
+
+#: builtin/checkout-index.c:162
+msgid "force overwrite of existing files"
+msgstr "forzar sobreescritura de los archivos existentes"
+
+#: builtin/checkout-index.c:164
+msgid "no warning for existing files and files not in index"
+msgstr ""
+"no hay advertencias para los archivos existentes y los archivos no están en "
+"el índice"
+
+#: builtin/checkout-index.c:166
+msgid "don't checkout new files"
+msgstr "no revisar archivos nuevos"
+
+#: builtin/checkout-index.c:168
+msgid "update stat information in the index file"
+msgstr "actualizar información de estado en el archivo índice"
+
+#: builtin/checkout-index.c:172
+msgid "read list of paths from the standard input"
+msgstr "leer lista de rutas desde standard input"
+
+#: builtin/checkout-index.c:174
+msgid "write the content to temporary files"
+msgstr "escribir el contenido en un archivo temporal"
+
+#: 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
+msgid "string"
+msgstr "string"
+
+#: builtin/checkout-index.c:176
+msgid "when creating files, prepend <string>"
+msgstr "cuando cree archivos, anteponer <string>"
+
+#: builtin/checkout-index.c:178
+msgid "copy out the files from named stage"
+msgstr "copiar los archivos del stage nombrado"
+
+#: builtin/checkout.c:26
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opciones>]  <rama>"
+
+#: builtin/checkout.c:27
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
+
+#: builtin/checkout.c:135 builtin/checkout.c:168
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "ruta '%s' no tiene nuestra versión"
+
+#: builtin/checkout.c:137 builtin/checkout.c:170
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "ruta '%s' no tiene su versión"
+
+#: builtin/checkout.c:153
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "ruta '%s' no tiene todas las versiones necesarias"
+
+#: builtin/checkout.c:197
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "ruta '%s' no tiene versiones necesarias"
+
+#: builtin/checkout.c:214
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "ruta '%s': no se puede fusionar"
+
+#: 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: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: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: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."
+
+#: builtin/checkout.c:342 builtin/checkout.c:349
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "ruta '%s' no esta fusionada"
+
+#: builtin/checkout.c:501
+msgid "you need to resolve your current index first"
+msgstr "necesita resolver su índice actual primero"
+
+#: builtin/checkout.c:632
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "No se puede hacer reflog para '%s': %s\n"
+
+#: builtin/checkout.c:673
+msgid "HEAD is now at"
+msgstr "HEAD está ahora en"
+
+#: builtin/checkout.c:677 builtin/clone.c:683
+msgid "unable to update HEAD"
+msgstr "no es posible actualizar  HEAD"
+
+#: builtin/checkout.c:681
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Reiniciar rama '%s'\n"
+
+#: builtin/checkout.c:684
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Ya en '%s'\n"
+
+#: builtin/checkout.c:688
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Rama reiniciada y cambiada a '%s'\n"
+
+#: builtin/checkout.c:690 builtin/checkout.c:1086
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Cambiado a nueva rama '%s'\n"
+
+#: builtin/checkout.c:692
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Cambiado a rama '%s'\n"
+
+#: builtin/checkout.c:743
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... y %d más.\n"
+
+#: builtin/checkout.c:749
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"Peligro: está saliendo %d commit atrás, no está conectado\n"
+"a ninguna rama:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Peligro: está saliendo %d commits antrás, no está conectado\n"
+"a ninguna rama:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:768
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"Si quiere conservarlo creando una nueva rama, este es un buen momento\n"
+"para hacerlo:\n"
+"\n"
+" git branch <nuevo-nombre-de-rama> %s\n"
+"\n"
+msgstr[1] ""
+"Si quiere conservarlos creando una nueva rama, este es un buen momento\n"
+"para hacerlo:\n"
+"\n"
+" git branch <nombre-de-rama> %s\n"
+"\n"
+
+#: builtin/checkout.c:809
+msgid "internal error in revision walk"
+msgstr "error interno en camino de reivison"
+
+#: builtin/checkout.c:813
+msgid "Previous HEAD position was"
+msgstr "La posicion previa de HEAD era"
+
+#: builtin/checkout.c:843 builtin/checkout.c:1081
+msgid "You are on a branch yet to be born"
+msgstr "Estas en una rama por nacer"
+
+#: builtin/checkout.c:987
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "solo una referencia esperada, %d entregadas."
+
+#: builtin/checkout.c:1027 builtin/worktree.c:233
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referencia invalida: %s"
+
+#: builtin/checkout.c:1056
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "la referencia no es n arbol: %s"
+
+#: builtin/checkout.c:1095
+msgid "paths cannot be used with switching branches"
+msgstr "rutas no pueden ser usadas con cambios de rama"
+
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' no puede ser usado con cambios de ramas"
+
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' no puede ser usado con '%s'"
+
+#: builtin/checkout.c:1122
+#, 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: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
+msgid "branch"
+msgstr "rama"
+
+#: builtin/checkout.c:1155
+msgid "create and checkout a new branch"
+msgstr "crear y hacer checkout a una nueva rama"
+
+#: builtin/checkout.c:1157
+msgid "create/reset and checkout a branch"
+msgstr "crear/reiniciar y hacer checkout a una rama"
+
+#: builtin/checkout.c:1158
+msgid "create reflog for new branch"
+msgstr "crear un reflog para una nueva rama"
+
+#: builtin/checkout.c:1159 builtin/worktree.c:350
+msgid "detach HEAD at named commit"
+msgstr "desacoplar HEAD en el commit nombrado"
+
+#: builtin/checkout.c:1160
+msgid "set upstream info for new branch"
+msgstr "configurar info de upstream para una rama nueva"
+
+#: builtin/checkout.c:1162
+msgid "new-branch"
+msgstr "nueva-rama"
+
+#: builtin/checkout.c:1162
+msgid "new unparented branch"
+msgstr "nueva rama no emparentada"
+
+#: builtin/checkout.c:1163
+msgid "checkout our version for unmerged files"
+msgstr "hacer checkout a  nuestra version para archivos sin fusionar"
+
+#: builtin/checkout.c:1165
+msgid "checkout their version for unmerged files"
+msgstr "hacer checkout a su version para los archivos sin fusionar"
+
+#: builtin/checkout.c:1167
+msgid "force checkout (throw away local modifications)"
+msgstr "forzar el checkout (descartar modificaciones locales)"
+
+#: builtin/checkout.c:1168
+msgid "perform a 3-way merge with the new branch"
+msgstr "realizar una fusion de tres vias con la rama nueva"
+
+#: builtin/checkout.c:1169 builtin/merge.c:238
+msgid "update ignored files (default)"
+msgstr "actualizar archivos ignorados (default)"
+
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
+msgid "style"
+msgstr "estilo"
+
+#: builtin/checkout.c:1171
+msgid "conflict style (merge or diff3)"
+msgstr "conflicto de estilos (merge o diff3)"
+
+#: builtin/checkout.c:1174
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "no limitar pathspecs a dispersar entradas solamente"
+
+#: builtin/checkout.c:1176
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
+
+#: builtin/checkout.c:1178
+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: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
+msgid "force progress reporting"
+msgstr "forzar el reporte de progreso"
+
+#: builtin/checkout.c:1212
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b, -B y --orphan son mutuamente exclusivas"
+
+#: builtin/checkout.c:1229
+msgid "--track needs a branch name"
+msgstr "--track necesita el nombre de una rama"
+
+#: builtin/checkout.c:1234
+msgid "Missing branch name; try -b"
+msgstr "Falta nombre de rama; prueba -b"
+
+#: builtin/checkout.c:1270
+msgid "invalid path specification"
+msgstr "Especificacion de ruta invalida"
+
+#: builtin/checkout.c:1277
+#, 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:1281
+#, 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:1285
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
+"se revisa fuera del índice."
+
+#: 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ón>] [-x | -X] [--] <rutas>..."
+
+#: builtin/clean.c:30
+#, c-format
+msgid "Removing %s\n"
+msgstr "Borrando %s\n"
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Sera borrado %s\n"
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Saltando repositorio %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Se saltara repositorio %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "failed to remove %s"
+msgstr "fallo al borrar %s"
+
+#: builtin/clean.c:301 git-add--interactive.perl:572
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"Ayuda rapida:\n"
+"1          - selecciona un objeto por numero\n"
+"foo        - selecciona un objeto basado en un prefijo unico\n"
+"           - (vacio) no elegir nada\n"
+
+#: builtin/clean.c:305 git-add--interactive.perl:581
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"Ayuda rapida:\n"
+"1          - selecciona un objeto unico\n"
+"3-5        - selecciona un rango de objtos\n"
+"2-3,6-9    - selecciona multiples rangos\n"
+"foo        - selecciona un objeto basado en un prefijo unico\n"
+"-...       - deseleccionar objetos especificados\n"
+"*          - escoger todos los objetos\n"
+"           - (vacio) terminar seleccion\n"
+
+#: builtin/clean.c:521 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Ahh (%s)?\n"
+
+#: builtin/clean.c:663
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Input ignora los patrones >> "
+
+#: builtin/clean.c:700
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
+
+#: builtin/clean.c:721
+msgid "Select items to delete"
+msgstr "Seleccionar objetos para borrar"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:762
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Borrar %s [y/N]? "
+
+#: builtin/clean.c:787 git-add--interactive.perl:1616
+#, c-format
+msgid "Bye.\n"
+msgstr "Bye.\n"
+
+#: builtin/clean.c:795
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - comenzar la limpieza\n"
+"filtrar por patron   - excluye objetos del borrado \n"
+"elegir por numeros   - selecciona objetos a ser borrados por numero\n"
+"preguntar cada uno     - confirmar cada borrado (como \"rm -i\")\n"
+"quit                - parar limpieza\n"
+"help                - esta ventana\n"
+"?                   - ayuda para seleccion de opciones"
+
+#: builtin/clean.c:822 git-add--interactive.perl:1692
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: builtin/clean.c:823 git-add--interactive.perl:1689
+msgid "What now"
+msgstr "Ahora que"
+
+#: builtin/clean.c:831
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Se removera el siguiente objeto"
+msgstr[1] "Se removeran los siguientes objetos:"
+
+#: builtin/clean.c:847
+msgid "No more files to clean, exiting."
+msgstr "No hay mas archivos para limpiar, saliendo."
+
+#: builtin/clean.c:909
+msgid "do not print names of files removed"
+msgstr "no imprimir nombres de archivos borrados"
+
+#: builtin/clean.c:911
+msgid "force"
+msgstr "forzar"
+
+#: builtin/clean.c:912
+msgid "interactive cleaning"
+msgstr "limpieza interactiva"
+
+#: builtin/clean.c:914
+msgid "remove whole directories"
+msgstr "borrar directorios completos"
+
+#: 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/name-rev.c:399 builtin/show-ref.c:176
+msgid "pattern"
+msgstr "patron"
+
+#: builtin/clean.c:916
+msgid "add <pattern> to ignore rules"
+msgstr "agregar <patron> para ignorar reglas"
+
+#: builtin/clean.c:917
+msgid "remove ignored files, too"
+msgstr "borrar archivos ignorados, tambien"
+
+#: builtin/clean.c:919
+msgid "remove only ignored files"
+msgstr "borrar solo archivos ignorados"
+
+#: builtin/clean.c:937
+msgid "-x and -X cannot be used together"
+msgstr "-x y -X no pueden ser usadas juntas"
+
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
+
+#: builtin/clean.c:944
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
+
+#: builtin/clone.c:39
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
+
+#: builtin/clone.c:83
+msgid "don't create a checkout"
+msgstr "no crear checkout"
+
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+msgid "create a bare repository"
+msgstr "crear un repositorio vacio"
+
+#: builtin/clone.c:88
+msgid "create a mirror repository (implies bare)"
+msgstr "crear un repositorio espejo (implica vacio)"
+
+#: builtin/clone.c:90
+msgid "to clone from a local repository"
+msgstr "clonar de un repositorio local"
+
+#: builtin/clone.c:92
+msgid "don't use local hardlinks, always copy"
+msgstr "no usar hardlinks, siempre copiar"
+
+#: builtin/clone.c:94
+msgid "setup as shared repository"
+msgstr "configurar como repositorio compartido"
+
+#: builtin/clone.c:96 builtin/clone.c:100
+msgid "pathspec"
+msgstr "pathspec"
+
+#: builtin/clone.c:96 builtin/clone.c:100
+msgid "initialize submodules in the clone"
+msgstr "inicializar submodulos en el clonado"
+
+#: builtin/clone.c:103
+msgid "number of submodules cloned in parallel"
+msgstr "numero de submodulos clonados en paralelo"
+
+#: builtin/clone.c:104 builtin/init-db.c:476
+msgid "template-directory"
+msgstr "directorio-template"
+
+#: builtin/clone.c:105 builtin/init-db.c:477
+msgid "directory from which templates will be used"
+msgstr "directorio del cual los templates seran usados"
+
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
+msgid "reference repository"
+msgstr "repositorio de referencia"
+
+#: builtin/clone.c:111
+msgid "use --reference only while cloning"
+msgstr "usa--reference sólo al clonar"
+
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+msgid "name"
+msgstr "nombre"
+
+#: builtin/clone.c:113
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
+
+#: builtin/clone.c:115
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "checkout <rama> en lugar de HEAD remota"
+
+#: builtin/clone.c:117
+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:137 builtin/grep.c:804
+#: builtin/pull.c:205
+msgid "depth"
+msgstr "profundidad"
+
+#: builtin/clone.c:119
+msgid "create a shallow clone of that depth"
+msgstr "crear un clon superficial para esa profundidad"
+
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
+#: parse-options.h:142
+msgid "time"
+msgstr "tiempo"
+
+#: builtin/clone.c:121
+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:141
+msgid "revision"
+msgstr "revision"
+
+#: builtin/clone.c:123 builtin/fetch.c:142
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "ahondando historia de clon superficial, excluyendo rev"
+
+#: builtin/clone.c:125
+msgid "clone only one branch, HEAD or --branch"
+msgstr "clonar solo una rama,HEAD o --branch"
+
+#: builtin/clone.c:127
+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"
+
+#: builtin/clone.c:129
+msgid "any cloned submodules will be shallow"
+msgstr "cualquier submódulo clonado será superficial"
+
+#: builtin/clone.c:130 builtin/init-db.c:485
+msgid "gitdir"
+msgstr "gitdir"
+
+#: builtin/clone.c:131 builtin/init-db.c:486
+msgid "separate git dir from working tree"
+msgstr "separa git dir del árbol de trabajo"
+
+#: builtin/clone.c:132
+msgid "key=value"
+msgstr "llave=valor"
+
+#: builtin/clone.c:133
+msgid "set config inside the new repository"
+msgstr "configurar config dentro del nuevo repositorio"
+
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
+msgid "use IPv4 addresses only"
+msgstr "solo usar direcciones IPv4"
+
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
+msgid "use IPv6 addresses only"
+msgstr "solo usar direcciones IPv6"
+
+#: builtin/clone.c:273
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+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
+#, 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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "fallo al abrir '%s'"
+
+#: builtin/clone.c:406
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s existe pero no es un directorio"
+
+#: builtin/clone.c:420
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "falló al analizar %s\n"
+
+#: builtin/clone.c:442
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "fallo al crear link '%s'"
+
+#: builtin/clone.c:446
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "fallo al copiar archivo a '%s'"
+
+#: builtin/clone.c:471
+#, c-format
+msgid "done.\n"
+msgstr "hecho.\n"
+
+#: builtin/clone.c:483
+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 ""
+"Clonado exitoso, pero falló el checkout.\n"
+"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
+"y volver a intentarlo con 'git checkout -f HEAD'\n"
+
+#: builtin/clone.c:560
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "No se pudo encontrar la rama remota %s para clonar"
+
+#: builtin/clone.c:655
+msgid "remote did not send all necessary objects"
+msgstr "remoto no mando todos los objetos necsarios"
+
+#: builtin/clone.c:671
+#, c-format
+msgid "unable to update %s"
+msgstr "incapaz de actualizar %s"
+
+#: builtin/clone.c:720
+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"
+
+#: builtin/clone.c:751
+msgid "unable to checkout working tree"
+msgstr "no es posible realizar checkout en el arbol de trabajo"
+
+#: builtin/clone.c:796
+msgid "unable to write parameters to config file"
+msgstr "no es posible escribir parametors al arhivo config"
+
+#: builtin/clone.c:859
+msgid "cannot repack to clean up"
+msgstr "no se puede reempaquetar para limpiar"
+
+#: builtin/clone.c:861
+msgid "cannot unlink temporary alternates file"
+msgstr "no se puede desvincular archivos alternos temporales"
+
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
+msgid "Too many arguments."
+msgstr "Muchos argumentos."
+
+#: builtin/clone.c:898
+msgid "You must specify a repository to clone."
+msgstr "Tienes que especificar un repositorio para clonar"
+
+#: builtin/clone.c:911
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "Las opciones --bare y --origin %s son incompatibles."
+
+#: builtin/clone.c:914
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare y --separate-git-dir son incompatibles."
+
+#: builtin/clone.c:927
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repositorio '%s' no existe"
+
+#: builtin/clone.c:933 builtin/fetch.c:1360
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "profundidad %s no es un numero positivo"
+
+#: builtin/clone.c:943
+#, 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"
+
+#: builtin/clone.c:953
+#, 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:240 builtin/worktree.c:270
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "no se pudo crear directorios principales de '%s'"
+
+#: builtin/clone.c:971
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "no se pudo crear un arbol de trabajo '%s'"
+
+#: builtin/clone.c:983
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Clonando en un repositorio vacio '%s'...\n"
+
+#: builtin/clone.c:985
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Clonando en '%s'...\n"
+
+#: builtin/clone.c:1009
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive no es compatible con --reference y --reference-if-able al "
+"mismo tiempo"
+
+#: builtin/clone.c:1071
+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
+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
+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
+msgid "source repository is shallow, ignoring --local"
+msgstr "repositorio fuente es superficial, ignorando --local"
+
+#: builtin/clone.c:1083
+msgid "--local is ignored"
+msgstr "--local es ignorado"
+
+#: builtin/clone.c:1087
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr "No se sabe como clonar %s"
+
+#: builtin/clone.c:1142 builtin/clone.c:1150
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Rama remota %s no encontrada en upstream %s"
+
+#: builtin/clone.c:1153
+msgid "You appear to have cloned an empty repository."
+msgstr "Pareces haber clonado un repositorio sin contenido."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<opciones>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "revisa las variables de configuraciones "
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "capa a usar"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "Ancho maximo"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "Realizando padding en el borde izquierdo"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "Realizando padding en el borde derecho"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "Realizando padding entre columnas"
+
+#: builtin/column.c:52
+msgid "--command must be the first argument"
+msgstr "--command debe ser el primer argumento"
+
+#: builtin/commit.c:39
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opciones>] [--] <especificacion-de-ruta>..."
+
+#: builtin/commit.c:44
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opciones>] [--] <especificacion-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 automaticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurandolos de forma explicita. Ejecuta "
+"el \n"
+"siguiente comando y sigue las instrucciones de tu editor\n"
+" para modificar tu archivo de configuracion:\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 automaticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurandolos 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
+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"
+"el commit completamente con \"git reset HEAD^\".\n"
+
+#: builtin/commit.c:79
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"El cherry-pick anterior ahora esta vacio, posiblemente por un conflicto de "
+"resolucion.\n"
+"Si desea realizar un commit de todas maneras, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:86
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "Caso contrario, por favor usa 'git reset'\n"
+
+#: builtin/commit.c:89
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"Si quiere saltar este commit, use:\n"
+"\n"
+"    git reset\n"
+"\n"
+"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
+"para los commits restantes.\n"
+
+#: builtin/commit.c:318
+msgid "failed to unpack HEAD tree object"
+msgstr "fallo al desempaquetar objeto del árbol HEAD"
+
+#: builtin/commit.c:359
+msgid "unable to create temporary index"
+msgstr "no es posible crear un indice temporal"
+
+#: builtin/commit.c:365
+msgid "interactive add failed"
+msgstr "adicion interactiva fallida"
+
+#: builtin/commit.c:378
+msgid "unable to update temporary index"
+msgstr "no es posible actualizar el indice temporal"
+
+#: builtin/commit.c:380
+msgid "Failed to update main cache tree"
+msgstr "Fallo al actualizar el cache principal del arbol"
+
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+msgid "unable to write new_index file"
+msgstr "no es posible escribir archiv new_index"
+
+#: builtin/commit.c:461
+msgid "cannot do a partial commit during a merge."
+msgstr "no se puede realizar un commit parcial durante una fusion."
+
+#: builtin/commit.c:463
+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
+msgid "cannot read the index"
+msgstr "no se puede leer el indice."
+
+#: builtin/commit.c:490
+msgid "unable to write temporary index file"
+msgstr "no es posible escribir el indice temporal "
+
+#: builtin/commit.c:587
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "falta header de autor al commit '%s'"
+
+#: builtin/commit.c:589
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "el commit '%s' tiene una linea de autor mal formada"
+
+#: builtin/commit.c:608
+msgid "malformed --author parameter"
+msgstr "parametro --author mal formado"
+
+#: builtin/commit.c:660
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"no es posible seleccionar un caracter de comentario que no es usado\n"
+"en el mensaje de commit actual"
+
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "no se pudo revisar el commit %s"
+
+#: builtin/commit.c:709 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
+msgid "could not read log from standard input"
+msgstr "no se pudo leer log desde standard input"
+
+#: builtin/commit.c:715
+#, 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
+msgid "could not read SQUASH_MSG"
+msgstr "no se pudo leer SQUASH_MSG"
+
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
+msgstr "no se pudo leer MERGE_MSG"
+
+#: builtin/commit.c:801
+msgid "could not write commit template"
+msgstr "no se pudo escribit el template del commit"
+
+#: builtin/commit.c:819
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que estas haciendo un commit con una fusion dentro.\n"
+"Si esto no es correcto, por favor remueve el archivo\n"
+"\t%s\n"
+"y vuelve a intentar.\n"
+
+#: builtin/commit.c:824
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que puede estar haciendo un commit a un cherry-pick.\n"
+"Si esto no es correcto, por favor elimine el archivo\n"
+"\t%s\n"
+"y vuelva a intentar.\n"
+
+#: builtin/commit.c:837
+#, 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 ""
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
+"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
+
+#: builtin/commit.c:844
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
+"con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
+"Un mensaje vacío aborta el commit.\n"
+
+#: builtin/commit.c:861
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sAutor:     %.*s <%.*s>"
+
+#: builtin/commit.c:869
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sFecha:     %s"
+
+#: builtin/commit.c:876
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sCommitter: %.*s <%.*s>"
+
+#: builtin/commit.c:893
+msgid "Cannot read index"
+msgstr "No se puede leer el índice"
+
+#: builtin/commit.c:958
+msgid "Error building trees"
+msgstr "Error al construir los árboles"
+
+#: builtin/commit.c:972 builtin/tag.c:252
+#, 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:1075
+#, 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:1335
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Modo inválido de los archivos no rastreados '%s'"
+
+#: builtin/commit.c:1128
+msgid "--long and -z are incompatible"
+msgstr "--long y -z son incompatibles"
+
+#: builtin/commit.c:1158
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Usar ambos --reset-author y --author no tiene sentido"
+
+#: builtin/commit.c:1167
+msgid "You have nothing to amend."
+msgstr "No tienes nada que enmendar."
+
+#: builtin/commit.c:1170
+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:1172
+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:1175
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
+
+#: builtin/commit.c:1185
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo."
+
+#: builtin/commit.c:1187
+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:1195
+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:1212
+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:1214
+msgid "No paths with --include/--only does not make sense."
+msgstr "No hay rutas con --include/--only no tiene sentido."
+
+#: builtin/commit.c:1226 builtin/tag.c:535
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo cleanup invalido %s"
+
+#: builtin/commit.c:1231
+msgid "Paths with -a does not make sense."
+msgstr "Rutas con -a no tiene sentido."
+
+#: builtin/commit.c:1349 builtin/commit.c:1626
+msgid "show status concisely"
+msgstr "mostrar status de manera concisa"
+
+#: builtin/commit.c:1351 builtin/commit.c:1628
+msgid "show branch information"
+msgstr "mostrar informacion de la rama"
+
+#: builtin/commit.c:1353
+msgid "show stash information"
+msgstr "mostrar informacion del stash"
+
+#: builtin/commit.c:1355
+msgid "version"
+msgstr "version"
+
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
+msgid "machine-readable output"
+msgstr "output formato-maquina"
+
+#: builtin/commit.c:1358 builtin/commit.c:1632
+msgid "show status in long format (default)"
+msgstr "mostrar status en formato largo (default)"
+
+#: builtin/commit.c:1361 builtin/commit.c:1635
+msgid "terminate entries with NUL"
+msgstr "terminar entradas con NUL"
+
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
+msgid "mode"
+msgstr "modo"
+
+#: builtin/commit.c:1364 builtin/commit.c:1638
+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:1367
+msgid "show ignored files"
+msgstr "mostrar archivos ignorados"
+
+#: builtin/commit.c:1368 parse-options.h:155
+msgid "when"
+msgstr "cuando"
+
+#: builtin/commit.c:1369
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. "
+"(Default: all)"
+
+#: builtin/commit.c:1371
+msgid "list untracked files in columns"
+msgstr "listar en columnas los archivos sin seguimiento"
+
+#: builtin/commit.c:1449
+msgid "couldn't look up newly created commit"
+msgstr "no se pudo revisar el commit recién creado"
+
+#: builtin/commit.c:1451
+msgid "could not parse newly created commit"
+msgstr "no se pudo analizar el commit recién creado"
+
+#: builtin/commit.c:1496
+msgid "detached HEAD"
+msgstr "HEAD desacoplado"
+
+#: builtin/commit.c:1499
+msgid " (root-commit)"
+msgstr "(commit-raiz)"
+
+#: builtin/commit.c:1596
+msgid "suppress summary after successful commit"
+msgstr "suprime summary tras un commit exitoso"
+
+#: builtin/commit.c:1597
+msgid "show diff in commit message template"
+msgstr "mostrar diff en el template del mensaje de commit"
+
+#: builtin/commit.c:1599
+msgid "Commit message options"
+msgstr "Opciones para el mensaje de la confirmación"
+
+#: builtin/commit.c:1600 builtin/tag.c:388
+msgid "read message from file"
+msgstr "leer mensaje desde un archivo"
+
+#: builtin/commit.c:1601
+msgid "author"
+msgstr "autor"
+
+#: builtin/commit.c:1601
+msgid "override author for commit"
+msgstr "sobrescribe el autor de la confirmación"
+
+#: builtin/commit.c:1602 builtin/gc.c:359
+msgid "date"
+msgstr "fecha"
+
+#: builtin/commit.c:1602
+msgid "override date for commit"
+msgstr "sobrescribe la fecha de la confirmación"
+
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
+msgid "message"
+msgstr "mensaje"
+
+#: builtin/commit.c:1603
+msgid "commit message"
+msgstr "mensaje de la confirmación"
+
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
+msgid "commit"
+msgstr "confirmar"
+
+#: builtin/commit.c:1604
+msgid "reuse and edit message from specified commit"
+msgstr "reusar y editar el mensaje de un commit especifico"
+
+#: builtin/commit.c:1605
+msgid "reuse message from specified commit"
+msgstr "reusar el mensaje de un commit especifico"
+
+#: builtin/commit.c:1606
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+"usar mensaje de formato autosquash para arreglar el commit especificado"
+
+#: builtin/commit.c:1607
+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:1608
+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:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
+msgid "add Signed-off-by:"
+msgstr "agregar Signed-off-by: (firmado por)"
+
+#: builtin/commit.c:1610
+msgid "use specified template file"
+msgstr "usar archivo template especificado"
+
+#: builtin/commit.c:1611
+msgid "force edit of commit"
+msgstr "forzar la edición de la confirmación"
+
+#: builtin/commit.c:1612
+msgid "default"
+msgstr "default"
+
+#: builtin/commit.c:1612 builtin/tag.c:391
+msgid "how to strip spaces and #comments from message"
+msgstr "cómo quitar espacios y #comentarios de mensajes"
+
+#: builtin/commit.c:1613
+msgid "include status in commit message template"
+msgstr "incluir status en el template del mensaje de commit"
+
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
+#: builtin/revert.c:113
+msgid "GPG sign commit"
+msgstr "firmar confirmación con GPG"
+
+#: builtin/commit.c:1618
+msgid "Commit contents options"
+msgstr "Opciones para el contenido de la confirmación"
+
+#: builtin/commit.c:1619
+msgid "commit all changed files"
+msgstr "confirmar todos los archivos cambiados"
+
+#: builtin/commit.c:1620
+msgid "add specified files to index for commit"
+msgstr "agregar archivos específicos al índice para confirmar"
+
+#: builtin/commit.c:1621
+msgid "interactively add files"
+msgstr "agregar archivos interactivamente"
+
+#: builtin/commit.c:1622
+msgid "interactively add changes"
+msgstr "agregar cambios interactivamente"
+
+#: builtin/commit.c:1623
+msgid "commit only specified files"
+msgstr "sólo confirmar archivos específicos"
+
+#: builtin/commit.c:1624
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr ""
+"evitar los capturadores (hooks) de pre-confirmación (pre-commit) y mensaje "
+"de confirmación (commit-msg)"
+
+#: builtin/commit.c:1625
+msgid "show what would be committed"
+msgstr "mostrar lo que sería confirmado"
+
+#: builtin/commit.c:1636
+msgid "amend previous commit"
+msgstr "enmendar confirmación previa"
+
+#: builtin/commit.c:1637
+msgid "bypass post-rewrite hook"
+msgstr "gancho bypass post reescritura"
+
+#: builtin/commit.c:1642
+msgid "ok to record an empty change"
+msgstr "ok al grabar un cambio vacio"
+
+#: builtin/commit.c:1644
+msgid "ok to record a change with an empty message"
+msgstr "ok al grabar un cambio con un mensaje vacio"
+
+#: builtin/commit.c:1674
+msgid "could not parse HEAD commit"
+msgstr "no se pudo analizar el commit de HEAD"
+
+#: builtin/commit.c:1719
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Archivo MERGE_HEAD (%s) corrupto"
+
+#: builtin/commit.c:1726
+msgid "could not read MERGE_MODE"
+msgstr "no se pudo leer MERGE_MODE"
+
+#: builtin/commit.c:1745
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "no se pudo leer el mensaje de commit: %s"
+
+#: builtin/commit.c:1756
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Abortando confirmación debido que el mensaje está en blanco.\n"
+
+#: builtin/commit.c:1761
+#, 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:1809
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"El repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
+"new_index. Verifique que el disco no este lleno y la quota no ha\n"
+"sido superada, y luego \"git reset HEAD\" para recuperar."
+
+#: builtin/config.c:10
+msgid "git config [<options>]"
+msgstr "git config [<opciones>]"
+
+#: builtin/config.c:57
+msgid "Config file location"
+msgstr "ubicacion del archivo config"
+
+#: builtin/config.c:58
+msgid "use global config file"
+msgstr "usar archivo de config global"
+
+#: builtin/config.c:59
+msgid "use system config file"
+msgstr "usar archivo de config del sistema"
+
+#: builtin/config.c:60
+msgid "use repository config file"
+msgstr "usar archivo de config del repositorio"
+
+#: builtin/config.c:61
+msgid "use given config file"
+msgstr "usar archivo config especificado"
+
+#: builtin/config.c:62
+msgid "blob-id"
+msgstr "blob-id"
+
+#: builtin/config.c:62
+msgid "read config from given blob object"
+msgstr "leer config del objeto blob suministrado"
+
+#: builtin/config.c:63
+msgid "Action"
+msgstr "Accion"
+
+#: builtin/config.c:64
+msgid "get value: name [value-regex]"
+msgstr "obtener valor: nombre [valor-regex]"
+
+#: builtin/config.c:65
+msgid "get all values: key [value-regex]"
+msgstr "obtener todos los valores: llave [valores-regex]"
+
+#: builtin/config.c:66
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
+
+#: builtin/config.c:67
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "obtener valor especifico para el URL: seccion[.var] URL"
+
+#: builtin/config.c:68
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+"remplazar todas las variables que concuerden: nombre valor [valor_regex]"
+
+#: builtin/config.c:69
+msgid "add a new variable: name value"
+msgstr "agregar nueva variable: nombre valor "
+
+#: builtin/config.c:70
+msgid "remove a variable: name [value-regex]"
+msgstr "borrar una variable. nombre [valor-regex]"
+
+#: builtin/config.c:71
+msgid "remove all matches: name [value-regex]"
+msgstr "borrar todas las concurrencias: nombre [valor-regex]"
+
+#: builtin/config.c:72
+msgid "rename section: old-name new-name"
+msgstr "renombrar seccion: nombre-viejo nombre-nuevo"
+
+#: builtin/config.c:73
+msgid "remove a section: name"
+msgstr "borrar una seccion: nombre"
+
+#: builtin/config.c:74
+msgid "list all"
+msgstr "listar todo"
+
+#: builtin/config.c:75
+msgid "open an editor"
+msgstr "abrir el editor"
+
+#: builtin/config.c:76
+msgid "find the color configured: slot [default]"
+msgstr "encontrar el color configurado: slot [default]"
+
+#: builtin/config.c:77
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
+
+#: builtin/config.c:78
+msgid "Type"
+msgstr "Tipo"
+
+#: builtin/config.c:79
+msgid "value is \"true\" or \"false\""
+msgstr "valor es \"true\" o \"false\""
+
+#: builtin/config.c:80
+msgid "value is decimal number"
+msgstr "valor es un numero decimal"
+
+#: builtin/config.c:81
+msgid "value is --bool or --int"
+msgstr "valor es --bool o --int"
+
+#: builtin/config.c:82
+msgid "value is a path (file or directory name)"
+msgstr "valor es una ruta (archivo o nombre de directorio)"
+
+#: builtin/config.c:83
+msgid "Other"
+msgstr "Otro"
+
+#: builtin/config.c:84
+msgid "terminate values with NUL byte"
+msgstr "Terminar valores con un byte NUL"
+
+#: builtin/config.c:85
+msgid "show variable names only"
+msgstr "mostrar solo nombres de variables"
+
+#: builtin/config.c:86
+msgid "respect include directives on lookup"
+msgstr "respetar directivas include en la busqueda"
+
+#: builtin/config.c:87
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "mostrar el origen de configuracion (archivo, stdin, blob, comando)"
+
+#: builtin/config.c:327
+msgid "unable to parse default color value"
+msgstr "no es posible analizar el valor default de color "
+
+#: builtin/config.c:471
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Este es el archivo de configuración de Git por usuario.\n"
+"[user]\n"
+"# Por favor, adapta y descomenta las siguientes líneas:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local solo puedo ser usado dentro de un repositorio"
+
+#: builtin/config.c:624
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "no se puede crear el archivo de configuración %s"
+
+#: builtin/config.c:637
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"no se puede sobrescribir múltiples valores con un único valor\n"
+"\tUse una regexp, --add o --replace-all para cambiar %s."
+
+#: builtin/count-objects.c:88
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:98
+msgid "print sizes in human readable format"
+msgstr "mostrar tamaños en formato legible para humano"
+
+#: builtin/describe.c:19
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opciones>] [<commit-ish>...]"
+
+#: builtin/describe.c:20
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opciones>] --dirty"
+
+#: builtin/describe.c:54
+msgid "head"
+msgstr "head"
+
+#: builtin/describe.c:54
+msgid "lightweight"
+msgstr "ligero"
+
+#: builtin/describe.c:54
+msgid "annotated"
+msgstr "anotado"
+
+#: builtin/describe.c:264
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "tag anotado %s no disponible"
+
+#: builtin/describe.c:268
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "tag anotado %s no tiene nombre embebido "
+
+#: builtin/describe.c:270
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "tag '%s' es realmente '%s' aquí"
+
+#: builtin/describe.c:297 builtin/log.c:493
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nombre de objeto %s no válido"
+
+#: builtin/describe.c:300
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no es un objeto '%s' válido"
+
+#: builtin/describe.c:317
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "no hay tag que concuerde exactamente con '%s'"
+
+#: builtin/describe.c:319
+#, c-format
+msgid "searching to describe %s\n"
+msgstr "buscanado para describir %s\n"
+
+#: builtin/describe.c:366
+#, c-format
+msgid "finished search at %s\n"
+msgstr "busqueda finalizada a las %s\n"
+
+#: builtin/describe.c:393
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"No hay tags anotados que puedan describir '%s'.\n"
+"Sin embargo, hubieron tags no anotados: intente --tags."
+
+#: builtin/describe.c:397
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Ningún tag puede describit '%s'.\n"
+"Intente --always, o cree algunos tags."
+
+#: builtin/describe.c:427
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu commits cruzados\n"
+
+#: builtin/describe.c:430
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+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:452
+msgid "find the tag that comes after the commit"
+msgstr "encontrar el tag que viene después del commit"
+
+#: builtin/describe.c:453
+msgid "debug search strategy on stderr"
+msgstr "hacer debug a la estrategia de búsqueda en stderr"
+
+#: builtin/describe.c:454
+msgid "use any ref"
+msgstr "use cualquier ref"
+
+#: builtin/describe.c:455
+msgid "use any tag, even unannotated"
+msgstr "use cualquier tag, incluso los no anotados"
+
+#: builtin/describe.c:456
+msgid "always use long format"
+msgstr "siempre usar formato largo"
+
+#: builtin/describe.c:457
+msgid "only follow first parent"
+msgstr "solo seguir el primer patrón"
+
+#: builtin/describe.c:460
+msgid "only output exact matches"
+msgstr "solo mostrar concordancias exactas"
+
+#: builtin/describe.c:462
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "considerar <n> tags más recientes (default:10)"
+
+#: builtin/describe.c:464
+msgid "only consider tags matching <pattern>"
+msgstr "solo considerar tags que concuerden con <patrón>"
+
+#: builtin/describe.c:466
+msgid "do not consider tags matching <pattern>"
+msgstr "no considerar tags que concuerden con <patrón>"
+
+#: builtin/describe.c:468 builtin/name-rev.c:406
+msgid "show abbreviated commit object as fallback"
+msgstr "mostrar el objeto commit abreviado como fallback"
+
+#: builtin/describe.c:469 builtin/describe.c:472
+msgid "mark"
+msgstr "marca"
+
+#: builtin/describe.c:470
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
+
+#: builtin/describe.c:473
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")"
+
+#: builtin/describe.c:491
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long es incompatible con --abbrev=0"
+
+#: builtin/describe.c:520
+msgid "No names found, cannot describe anything."
+msgstr "No se encontraron nombres, no se puede describir nada."
+
+#: builtin/describe.c:563
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty es imcompatible con commit-ismos"
+
+#: builtin/describe.c:565
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken es incompatible con commit-ismos"
+
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': no es un archivo regular o un enlace simbólico"
+
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
+msgstr "opción inválida: %s"
+
+#: builtin/diff.c:357
+msgid "Not a git repository"
+msgstr "No es un repositorio git"
+
+#: builtin/diff.c:400
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "objeto '%s' entregado no es válido"
+
+#: builtin/diff.c:409
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "más de dos blobs entregados: '%s'"
+
+#: builtin/diff.c:414
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "objeto no manejado '%s' entregado."
+
+#: builtin/difftool.c:29
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
+
+#: builtin/difftool.c:259
+#, c-format
+msgid "failed: %d"
+msgstr "falló: %d"
+
+#: builtin/difftool.c:301
+#, c-format
+msgid "could not read symlink %s"
+msgstr "no se pudo leer el symlink %s"
+
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "no se pudo leer el archivo symlink %s"
+
+#: builtin/difftool.c:311
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "no se pudo leer el objeto %s para el symlink %s"
+
+#: builtin/difftool.c:412
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
+"modo diff para directorio('-d' y '--dir-diff')."
+
+#: builtin/difftool.c:633
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "ambos archivos modificados: '%s' y '%s'."
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr "archivo del árbol de trabajo ha sido dejado."
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "archivo temporal existe en '%s'."
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr "tal vez desee limpiar o recuperar estos."
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "use `diff.guitool` en lugar de `diff.tool`"
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr "realizar un diff de todo el directorio"
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr "no mostrar antes de lanzar una herramienta de diff"
+
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
+msgstr "usar symlinks en modo dir-diff"
+
+#: builtin/difftool.c:707
+msgid "<tool>"
+msgstr "<herramienta>"
+
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
+msgstr "usar la herramienta de diff especificada"
+
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
+
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
+"código de salida distinto de cero"
+
+#: builtin/difftool.c:715
+msgid "<command>"
+msgstr "<comando>"
+
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
+msgstr "especificar un comando personalizado para ver diffs"
+
+#: builtin/difftool.c:740
+msgid "no <tool> given for --tool=<tool>"
+msgstr "no se ha entragado <herramienta> para --tool=<herramienta>"
+
+#: builtin/difftool.c:747
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "no se ha entregado <comando> para --extcmd=<comando>"
+
+#: builtin/fast-export.c:26
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:998
+msgid "show progress after <n> objects"
+msgstr "mostrar progreso después de <n> objetos"
+
+#: builtin/fast-export.c:1000
+msgid "select handling of signed tags"
+msgstr "seleccionar el manejo de tags firmados"
+
+#: builtin/fast-export.c:1003
+msgid "select handling of tags that tag filtered objects"
+msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
+
+#: builtin/fast-export.c:1006
+msgid "Dump marks to this file"
+msgstr "Volcar marcas a este archivo"
+
+#: builtin/fast-export.c:1008
+msgid "Import marks from this file"
+msgstr "Importar marcas de este archivo"
+
+#: builtin/fast-export.c:1010
+msgid "Fake a tagger when tags lack one"
+msgstr "Falsificar un tagger cuando les falta uno"
+
+#: builtin/fast-export.c:1012
+msgid "Output full tree for each commit"
+msgstr "Mostrar todo el árbol para cada commit"
+
+#: builtin/fast-export.c:1014
+msgid "Use the done feature to terminate the stream"
+msgstr "Use el feature done para terminar el stream"
+
+#: builtin/fast-export.c:1015
+msgid "Skip output of blob data"
+msgstr "Saltar el output de data blob"
+
+#: builtin/fast-export.c:1016
+msgid "refspec"
+msgstr "refspec"
+
+#: builtin/fast-export.c:1017
+msgid "Apply refspec to exported refs"
+msgstr "Aplicar refspec para los refs exportados"
+
+#: builtin/fast-export.c:1018
+msgid "anonymize output"
+msgstr "anonimizar la salida"
+
+#: builtin/fetch.c:23
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
+
+#: builtin/fetch.c:24
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opciones>] <grupo>"
+
+#: builtin/fetch.c:25
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
+
+#: builtin/fetch.c:26
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opciones>]"
+
+#: builtin/fetch.c:112 builtin/pull.c:182
+msgid "fetch from all remotes"
+msgstr "extraer de todos los remotos"
+
+#: builtin/fetch.c:114 builtin/pull.c:185
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
+
+#: builtin/fetch.c:116 builtin/pull.c:188
+msgid "path to upload pack on remote end"
+msgstr "ruta para cargar el paquete al final del remoto"
+
+#: builtin/fetch.c:117 builtin/pull.c:190
+msgid "force overwrite of local branch"
+msgstr "forzar sobrescritura de la rama local"
+
+#: builtin/fetch.c:119
+msgid "fetch from multiple remotes"
+msgstr "extraer de múltiples remotos"
+
+#: builtin/fetch.c:121 builtin/pull.c:192
+msgid "fetch all tags and associated objects"
+msgstr "extraer todos los tags y objetos asociados"
+
+#: builtin/fetch.c:123
+msgid "do not fetch all tags (--no-tags)"
+msgstr "no extraer todos los tags (--no-tags)"
+
+#: builtin/fetch.c:125
+msgid "number of submodules fetched in parallel"
+msgstr "número de submódulos extraídos en paralelo"
+
+#: builtin/fetch.c:127 builtin/pull.c:195
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto"
+
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
+msgid "on-demand"
+msgstr "en demanda"
+
+#: builtin/fetch.c:129
+msgid "control recursive fetching of submodules"
+msgstr "controlar extracción recursiva de submódulos"
+
+#: builtin/fetch.c:133 builtin/pull.c:203
+msgid "keep downloaded pack"
+msgstr "mantener el paquete descargado"
+
+#: builtin/fetch.c:135
+msgid "allow updating of HEAD ref"
+msgstr "permitir actualizar la ref HEAD"
+
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
+msgid "deepen history of shallow clone"
+msgstr "historia profunda de un clon superficial"
+
+#: builtin/fetch.c:140
+msgid "deepen history of shallow repository based on time"
+msgstr "historia profunda de un repositorio superficial basado en tiempo"
+
+#: builtin/fetch.c:146 builtin/pull.c:209
+msgid "convert to a complete repository"
+msgstr "convertir a un repositorio completo"
+
+#: builtin/fetch.c:148 builtin/log.c:1456
+msgid "dir"
+msgstr "dir"
+
+#: builtin/fetch.c:149
+msgid "prepend this to submodule path output"
+msgstr "anteponer esto a salida de la ruta del submódulo "
+
+#: builtin/fetch.c:152
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"default para extracción recursiva de submódulos (menor prioridad que "
+"archivos de configuración)"
+
+#: builtin/fetch.c:156 builtin/pull.c:212
+msgid "accept refs that update .git/shallow"
+msgstr "aceptar refs que actualicen .git/shallow"
+
+#: builtin/fetch.c:157 builtin/pull.c:214
+msgid "refmap"
+msgstr "refmap"
+
+#: builtin/fetch.c:158 builtin/pull.c:215
+msgid "specify fetch refmap"
+msgstr "especificar extracción de refmap"
+
+#: builtin/fetch.c:416
+msgid "Couldn't find remote ref HEAD"
+msgstr "No se puedo encontrar ref remota HEAD"
+
+#: builtin/fetch.c:534
+#, 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:627
+#, c-format
+msgid "object %s not found"
+msgstr "objeto %s no encontrado"
+
+#: builtin/fetch.c:631
+msgid "[up to date]"
+msgstr "[actualizado]"
+
+#: builtin/fetch.c:644 builtin/fetch.c:724
+msgid "[rejected]"
+msgstr "[rechazado]"
+
+#: builtin/fetch.c:645
+msgid "can't fetch in current branch"
+msgstr "no se puede traer en la rama actual"
+
+#: builtin/fetch.c:654
+msgid "[tag update]"
+msgstr "[actualización de etiqueta]"
+
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
+msgid "unable to update local ref"
+msgstr "no se posible actualizar el ref local"
+
+#: builtin/fetch.c:674
+msgid "[new tag]"
+msgstr "[nueva etiqueta]"
+
+#: builtin/fetch.c:677
+msgid "[new branch]"
+msgstr "[nueva rama]"
+
+#: builtin/fetch.c:680
+msgid "[new ref]"
+msgstr "[nueva referencia]"
+
+#: builtin/fetch.c:719
+msgid "forced update"
+msgstr "actualización forzada"
+
+#: builtin/fetch.c:724
+msgid "non-fast-forward"
+msgstr "avance lento"
+
+#: builtin/fetch.c:769
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s no envió todos los objetos necesarios\n"
+
+#: builtin/fetch.c:789
+#, 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:877 builtin/fetch.c:973
+#, c-format
+msgid "From %.*s\n"
+msgstr "Desde %.*s\n"
+
+#: builtin/fetch.c:888
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+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:943
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   (%s se pondrá colgado)"
+
+#: builtin/fetch.c:944
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   (%s se ha colgado)"
+
+#: builtin/fetch.c:976
+msgid "[deleted]"
+msgstr "[eliminado]"
+
+#: builtin/fetch.c:977 builtin/remote.c:1024
+msgid "(none)"
+msgstr "(nada)"
+
+#: builtin/fetch.c:1000
+#, 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:1019
+#, 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:1022
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opción \"%s\" es ignorada por %s\n"
+
+#: builtin/fetch.c:1098
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "No se sabe como extraer de %s"
+
+#: builtin/fetch.c:1258
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Extrayendo %s\n"
+
+#: builtin/fetch.c:1260 builtin/remote.c:97
+#, c-format
+msgid "Could not fetch %s"
+msgstr "No se pudo extraer %s"
+
+#: builtin/fetch.c:1278
+msgid ""
+"No remote repository specified.  Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+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:1301
+msgid "You need to specify a tag name."
+msgstr "Tiene que especificar un nombre de tag."
+
+#: builtin/fetch.c:1344
+msgid "Negative depth in --deepen is not supported"
+msgstr "Profundidad negativa en --deepen no es soportada"
+
+#: builtin/fetch.c:1346
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--depen y --depth son mutuamente exclusivas"
+
+#: builtin/fetch.c:1351
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth y --unshallow no pueden ser usadas juntas"
+
+#: builtin/fetch.c:1353
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow no tiene sentido en un repositorio completo"
+
+#: builtin/fetch.c:1366
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all no toma un argumento de repositorio"
+
+#: builtin/fetch.c:1368
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all no tiene sentido con refspecs"
+
+#: builtin/fetch.c:1379
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "No existe el remoto o grupo remoto: %s"
+
+#: builtin/fetch.c:1387
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
+
+#: 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 <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
+
+#: builtin/fmt-merge-msg.c:665
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "poblar el log con máximo <n> entradas del shorlog"
+
+#: builtin/fmt-merge-msg.c:668
+msgid "alias for --log (deprecated)"
+msgstr "alias para --log (deprecado)"
+
+#: builtin/fmt-merge-msg.c:671
+msgid "text"
+msgstr "texto"
+
+#: builtin/fmt-merge-msg.c:672
+msgid "use <text> as start of message"
+msgstr "use <text> como comienzo de mensaje"
+
+#: builtin/fmt-merge-msg.c:673
+msgid "file to read from"
+msgstr "archivo del cual leer"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<opciones>] [<patrón>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <objeto>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+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"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for 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"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for 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
+msgid "respect format colors"
+msgstr "respetar el formato de colores"
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr "mostrar solo refs que apunten al objeto dado"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr "mostrar solo refs que son fusionadas"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr "mostrar solo refs que no son fusionadas"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr "mostrar solo refs que contienen el commit"
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr "mostrar solo refs que no contienen el commit"
+
+#: builtin/fsck.c:543
+msgid "Checking object directories"
+msgstr "Revisando objetos directorios"
+
+#: builtin/fsck.c:635
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<opciones>] [<objeto>...]"
+
+#: builtin/fsck.c:641
+msgid "show unreachable objects"
+msgstr "mostrar objetos ilegibles"
+
+#: builtin/fsck.c:642
+msgid "show dangling objects"
+msgstr "mostrar objetos colgados"
+
+#: builtin/fsck.c:643
+msgid "report tags"
+msgstr "reportar tags"
+
+#: builtin/fsck.c:644
+msgid "report root nodes"
+msgstr "reportar nodos raíz"
+
+#: builtin/fsck.c:645
+msgid "make index objects head nodes"
+msgstr "hacer objetos índices cabezas de nodos"
+
+#: builtin/fsck.c:646
+msgid "make reflogs head nodes (default)"
+msgstr "hacer reflogs cabeza de nodos (default)"
+
+#: builtin/fsck.c:647
+msgid "also consider packs and alternate objects"
+msgstr "también considerar paquetes y objetos alternos"
+
+#: builtin/fsck.c:648
+msgid "check only connectivity"
+msgstr "revisar solo connectividad"
+
+#: builtin/fsck.c:649
+msgid "enable more strict checking"
+msgstr "habilitar revisión más estricta"
+
+#: builtin/fsck.c:651
+msgid "write dangling objects in .git/lost-found"
+msgstr "escribir objetos colgados en .git/lost-found"
+
+#: builtin/fsck.c:652 builtin/prune.c:107
+msgid "show progress"
+msgstr "mostrar prograso"
+
+#: builtin/fsck.c:653
+msgid "show verbose names for reachable objects"
+msgstr "mostrar nombres verboso para objetos alcanzables"
+
+#: builtin/fsck.c:714
+msgid "Checking objects"
+msgstr "Revisando objetos"
+
+#: builtin/gc.c:27
+msgid "git gc [<options>]"
+msgstr "git gc [<opciones>]"
+
+#: builtin/gc.c:80
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Falló el fstat %s: %s"
+
+#: builtin/gc.c:312
+#, c-format
+msgid "Can't stat %s"
+msgstr "No se puede definir %s"
+
+#: builtin/gc.c:321
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"El último gc reportó lo siguiente. Por favor corriga la causa\n"
+"y remueva %s.\n"
+"Limpieza automática no se realizará hasta que el archivo sea removido.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:360
+msgid "prune unreferenced objects"
+msgstr "limpiar objetos no referenciados"
+
+#: builtin/gc.c:362
+msgid "be more thorough (increased runtime)"
+msgstr "ser más exhaustivo (aumentar runtime)"
+
+#: builtin/gc.c:363
+msgid "enable auto-gc mode"
+msgstr "habilitar modo auto-gc"
+
+#: builtin/gc.c:364
+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
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Falló al analizar valor %s de gc.logexpirity"
+
+#: builtin/gc.c:409
+#, 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
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
+
+#: builtin/gc.c:412
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Vea \"git help gc\" para limpieza manual.\n"
+
+#: builtin/gc.c:437
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
+"es así)"
+
+#: builtin/gc.c:481
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
+"removerlos."
+
+#: builtin/grep.c:27
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
+
+#: builtin/grep.c:226
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: falló al crear el hilo: %s"
+
+#: builtin/grep.c:284
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "número inválido de hilos especificado (%d) para %s"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "no hay soporte para hilos, ignorando %s"
+
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "no es posible leer el  árbol (%s)"
+
+#: builtin/grep.c:628
+#, 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:694
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "switch `%c' espera un valor numérico"
+
+#: builtin/grep.c:781
+msgid "search in index instead of in the work tree"
+msgstr "buscar en el índice en lugar del árbol de trabajo"
+
+#: builtin/grep.c:783
+msgid "find in contents not managed by git"
+msgstr "encontrar en contenidos no manejados por git"
+
+#: builtin/grep.c:785
+msgid "search in both tracked and untracked files"
+msgstr "buscar en archivos rastreados y no rastreados"
+
+#: builtin/grep.c:787
+msgid "ignore files specified via '.gitignore'"
+msgstr "ingnorar archivos especificados via '.gitignore'"
+
+#: builtin/grep.c:789
+msgid "recursively search in each submodule"
+msgstr "búsqueda recursiva en cada submódulo"
+
+#: builtin/grep.c:792
+msgid "show non-matching lines"
+msgstr "mostrar líneas que no concuerdan"
+
+#: builtin/grep.c:794
+msgid "case insensitive matching"
+msgstr "búsqueda insensible a mayúsculas"
+
+#: builtin/grep.c:796
+msgid "match patterns only at word boundaries"
+msgstr "concordar patrón solo a los límites de las palabras"
+
+#: builtin/grep.c:798
+msgid "process binary files as text"
+msgstr "procesar archivos binarios como texto"
+
+#: builtin/grep.c:800
+msgid "don't match patterns in binary files"
+msgstr "no concordar patrones en archivos binarios"
+
+#: builtin/grep.c:803
+msgid "process binary files with textconv filters"
+msgstr "procesar archivos binarios con filtros textconv "
+
+#: builtin/grep.c:805
+msgid "descend at most <depth> levels"
+msgstr "descender como máximo <valor-de-profundiad>  niveles"
+
+#: builtin/grep.c:809
+msgid "use extended POSIX regular expressions"
+msgstr "usar expresiones regulares POSIX extendidas"
+
+#: builtin/grep.c:812
+msgid "use basic POSIX regular expressions (default)"
+msgstr "usar expresiones regulares POSIX (default)"
+
+#: builtin/grep.c:815
+msgid "interpret patterns as fixed strings"
+msgstr "interpretar patrones como strings arreglados"
+
+#: builtin/grep.c:818
+msgid "use Perl-compatible regular expressions"
+msgstr "usar expresiones regulares compatibles con Perl"
+
+#: builtin/grep.c:821
+msgid "show line numbers"
+msgstr "mostrar números de línea"
+
+#: builtin/grep.c:822
+msgid "don't show filenames"
+msgstr "no mostrar nombres de archivo"
+
+#: builtin/grep.c:823
+msgid "show filenames"
+msgstr "mostrar nombres de archivo"
+
+#: builtin/grep.c:825
+msgid "show filenames relative to top directory"
+msgstr "mostrar nombres de archivo relativos al directorio superior"
+
+#: builtin/grep.c:827
+msgid "show only filenames instead of matching lines"
+msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
+
+#: builtin/grep.c:829
+msgid "synonym for --files-with-matches"
+msgstr "sinónimo para --files-with-matches"
+
+#: builtin/grep.c:832
+msgid "show only the names of files without match"
+msgstr "mostrar solo los nombres de archivos sin coincidencias"
+
+#: builtin/grep.c:834
+msgid "print NUL after filenames"
+msgstr "imprimir NUL después del nombre de archivo"
+
+#: builtin/grep.c:836
+msgid "show the number of matches instead of matching lines"
+msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes"
+
+#: builtin/grep.c:837
+msgid "highlight matches"
+msgstr "resaltar concordancias"
+
+#: builtin/grep.c:839
+msgid "print empty line between matches from different files"
+msgstr "emprimir una línea vacía entre concordancias de diferentes archivos"
+
+#: builtin/grep.c:841
+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:844
+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:847
+msgid "show <n> context lines before matches"
+msgstr "mostrar <n> líneas de contexto antes de las concordancias"
+
+#: builtin/grep.c:849
+msgid "show <n> context lines after matches"
+msgstr "mostrar <n> líneas de context después de las concordancias"
+
+#: builtin/grep.c:851
+msgid "use <n> worker threads"
+msgstr "usar <n> hilos de trabajo"
+
+#: builtin/grep.c:852
+msgid "shortcut for -C NUM"
+msgstr "atajo para -C NUM"
+
+#: builtin/grep.c:855
+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:857
+msgid "show the surrounding function"
+msgstr "mostrar la función circundante"
+
+#: builtin/grep.c:860
+msgid "read patterns from file"
+msgstr "leer patrones del archivo"
+
+#: builtin/grep.c:862
+msgid "match <pattern>"
+msgstr "concordar <patrón>"
+
+#: builtin/grep.c:864
+msgid "combine patterns specified with -e"
+msgstr "combinar patrones especificados con -e"
+
+#: builtin/grep.c:876
+msgid "indicate hit with exit status without output"
+msgstr "indicar concordancia con exit status sin output"
+
+#: builtin/grep.c:878
+msgid "show only matches from files that match all patterns"
+msgstr ""
+"mostrar solo concordancias con archivos que concuerdan todos los patrones"
+
+#: builtin/grep.c:880
+msgid "show parse tree for grep expression"
+msgstr "mostrar árbol analizado para la expresión grep"
+
+#: builtin/grep.c:884
+msgid "pager"
+msgstr "paginador"
+
+#: builtin/grep.c:884
+msgid "show matching files in the pager"
+msgstr "mostrar archivos concordantes en el paginador"
+
+#: builtin/grep.c:887
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
+
+#: builtin/grep.c:950
+msgid "no pattern given."
+msgstr "no se ha entregado patrón"
+
+#: builtin/grep.c:982
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index o --untracked no se puede usar con revs"
+
+#: builtin/grep.c:989
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "no se posible resolver revisión: %s"
+
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "número inválido de hilos especificado (%d)"
+
+#: builtin/grep.c:1028
+msgid "no threads support, ignoring --threads"
+msgstr "no se soportan hilos, ignorando --threads"
+
+#: builtin/grep.c:1052
+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:1075
+msgid "option not supported with --recurse-submodules."
+msgstr "opción no soportada con --recurse-submodules."
+
+#: builtin/grep.c:1081
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr "--cached o --untracked no pueden ser usadas con --no-index."
+
+#: builtin/grep.c:1087
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado."
+
+#: builtin/grep.c:1095
+msgid "both --cached and trees are given."
+msgstr "--cached y árboles han sido entregados."
+
+#: builtin/hash-object.c:82
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
+"[--] <archivo>..."
+
+#: builtin/hash-object.c:83
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:95
+msgid "type"
+msgstr "tipo"
+
+#: builtin/hash-object.c:95
+msgid "object type"
+msgstr "tipo de objeto"
+
+#: builtin/hash-object.c:96
+msgid "write the object into the object database"
+msgstr "escribir el objeto en la base de datos de objetos"
+
+#: builtin/hash-object.c:98
+msgid "read the object from stdin"
+msgstr "leer el objeto de stdin"
+
+#: builtin/hash-object.c:100
+msgid "store file as is without filters"
+msgstr "guardar el archivo como es sin filtros"
+
+#: builtin/hash-object.c:101
+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
+msgid "process file as it were from this path"
+msgstr "procesar el archivo como si fuera de esta ruta"
+
+#: builtin/help.c:43
+msgid "print all available commands"
+msgstr "mostrar todos los comandos disponibles"
+
+#: builtin/help.c:44
+msgid "exclude guides"
+msgstr "excluir las guias"
+
+#: builtin/help.c:45
+msgid "print list of useful guides"
+msgstr "mostrar una lista de nociones utiles"
+
+#: builtin/help.c:46
+msgid "show man page"
+msgstr "mostrar la pagina del manual"
+
+#: builtin/help.c:47
+msgid "show manual in web browser"
+msgstr "mostrar la pagina del manual en un navegador web"
+
+#: builtin/help.c:49
+msgid "show info page"
+msgstr "mostrar la pagina de info"
+
+#: builtin/help.c:55
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
+
+#: builtin/help.c:67
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "formato help no reconocido '%s'"
+
+#: builtin/help.c:94
+msgid "Failed to start emacsclient."
+msgstr "Fallo al iniciar emacsclient."
+
+#: builtin/help.c:107
+msgid "Failed to parse emacsclient version."
+msgstr "Fallo al analizar la version de emacsclient."
+
+#: builtin/help.c:115
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "la version '%d' de emacsclient es muy antigua (<22)."
+
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "fallo al ejecutar '%s'"
+
+#: builtin/help.c:211
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': ruta para el visualizador del manual no soportada.\n"
+"Por favor considere usar 'man.<herramienta.cmd'."
+
+#: builtin/help.c:223
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': comando no soportado para man viewer.\n"
+"Por favor considere usar 'man.<herramienta>.path."
+
+#: builtin/help.c:340
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': visualizador de man desconocido"
+
+#: builtin/help.c:357
+msgid "no man viewer handled the request"
+msgstr "ningun visualizador de manual proceso la peticion"
+
+#: builtin/help.c:365
+msgid "no info viewer handled the request"
+msgstr "ningun visualizador de info manejo la peticion"
+
+#: builtin/help.c:407
+msgid "Defining attributes per path"
+msgstr "Defininiendo atributos por ruta"
+
+#: builtin/help.c:408
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "Git diario con 20 comandos o algo asi"
+
+#: builtin/help.c:409
+msgid "A Git glossary"
+msgstr "Un glosario de Git"
+
+#: builtin/help.c:410
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+
+#: builtin/help.c:411
+msgid "Defining submodule properties"
+msgstr "Definiendo las propiedades del submodulo"
+
+#: builtin/help.c:412
+msgid "Specifying revisions and ranges for Git"
+msgstr "Especificando revisiones y rangos para Git"
+
+#: builtin/help.c:413
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "Un tutorial de introduccion para Git ( para versiones 1.5.1 o mayores)"
+
+#: builtin/help.c:414
+msgid "An overview of recommended workflows with Git"
+msgstr "Un repaso de flujos de trabajo recomendadoes con Git"
+
+#: builtin/help.c:426
+msgid "The common Git guides are:\n"
+msgstr "Las guias communes de Git son:\n"
+
+#: builtin/help.c:444
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' tiene el alias '%s'"
+
+#: builtin/help.c:466 builtin/help.c:483
+#, c-format
+msgid "usage: %s%s"
+msgstr "uso: %s%s"
+
+#: builtin/index-pack.c:156
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#: builtin/index-pack.c:206
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "el tipo del objeto no concuerda en %s"
+
+#: builtin/index-pack.c:226
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "no se recibió el objeto esperado %s"
+
+#: builtin/index-pack.c:229
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objeto %s: tipo esperado %s, encontrado %s"
+
+#: builtin/index-pack.c:271
+#, 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
+msgid "early EOF"
+msgstr "EOF temprano"
+
+#: builtin/index-pack.c:282
+msgid "read error on input"
+msgstr "leer error en input"
+
+#: builtin/index-pack.c:294
+msgid "used more bytes than were available"
+msgstr "se usaron más bytes de los disponibles"
+
+#: builtin/index-pack.c:301
+msgid "pack too large for current definition of off_t"
+msgstr "paquete muy grande para la difinición actual de off_t"
+
+#: builtin/index-pack.c:304 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
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: builtin/index-pack.c:325
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "no se puede abrir el archivo de paquete '%s'"
+
+#: builtin/index-pack.c:339
+msgid "pack signature mismatch"
+msgstr "firma del paquete no concuerda"
+
+#: builtin/index-pack.c:341
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versión de paquete %<PRIu32> no soportada"
+
+#: builtin/index-pack.c:359
+#, 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
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate retornó %d"
+
+#: builtin/index-pack.c:529
+msgid "offset value overflow for delta base object"
+msgstr "valor de offset desbordado para el objeto base delta"
+
+#: builtin/index-pack.c:537
+msgid "delta base offset is out of bound"
+msgstr "offset de base delta está fuera de límites"
+
+#: builtin/index-pack.c:545
+#, c-format
+msgid "unknown object type %d"
+msgstr "tipo de objeto %d desconocido"
+
+#: builtin/index-pack.c:576
+msgid "cannot pread pack file"
+msgstr "no se puede propagar el paquete"
+
+#: builtin/index-pack.c:578
+#, 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
+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
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "COLLISIÓN SHA1 ENCONTRADA CON %s !"
+
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr "no se posible leer %s"
+
+#: builtin/index-pack.c:815
+#, 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
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "no se puede leer el objeto existente %s"
+
+#: builtin/index-pack.c:837
+#, c-format
+msgid "invalid blob object %s"
+msgstr "objeto blob %s inválido"
+
+#: builtin/index-pack.c:852
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#: builtin/index-pack.c:855
+msgid "Error in object"
+msgstr "Error en el objeto"
+
+#: builtin/index-pack.c:857
+#, 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
+msgid "failed to apply delta"
+msgstr "falló al aplicar delta"
+
+#: builtin/index-pack.c:1131
+msgid "Receiving objects"
+msgstr "Recibiendo objetos"
+
+#: builtin/index-pack.c:1131
+msgid "Indexing objects"
+msgstr "Indexando objetos"
+
+#: builtin/index-pack.c:1165
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paquete está corrompido (SHA1 no concuerda)"
+
+#: builtin/index-pack.c:1170
+msgid "cannot fstat packfile"
+msgstr "no se puede fstat al archivo de paquete"
+
+#: builtin/index-pack.c:1173
+msgid "pack has junk at the end"
+msgstr "el paquete tiene basura al final"
+
+#: builtin/index-pack.c:1185
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "confusión más allá de la locura en parse_pack_objects()"
+
+#: builtin/index-pack.c:1208
+msgid "Resolving deltas"
+msgstr "Resolviendo deltas"
+
+#: builtin/index-pack.c:1219
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "no es posible crear hilo: %s"
+
+#: builtin/index-pack.c:1261
+msgid "confusion beyond insanity"
+msgstr "confusión más allá de la locura"
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "completado con %d objeto local"
+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?)"
+
+#: builtin/index-pack.c:1283
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "paquete tiene %d delta sin resolver"
+msgstr[1] "paquete tiene %d deltas sin resolver"
+
+#: builtin/index-pack.c:1307
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "no es posible desinflar el objeto adjunto (%d)"
+
+#: builtin/index-pack.c:1383
+#, c-format
+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:1421
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr "no se puede escribir el archivo  guardado '%s'"
+
+#: builtin/index-pack.c:1429
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "no se puede cerrar el archivo guardado escrito '%s'"
+
+#: builtin/index-pack.c:1439
+msgid "cannot store pack file"
+msgstr "no se puede guardar el archivo paquete"
+
+#: builtin/index-pack.c:1447
+msgid "cannot store index file"
+msgstr "no se puede guardar el archivo índice"
+
+#: builtin/index-pack.c:1485
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "mal pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1553
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "No se puede abrir el archivo paquete existente '%s'"
+
+#: builtin/index-pack.c:1555
+#, 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
+#, 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
+#, 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:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
+#, c-format
+msgid "bad %s"
+msgstr "mal %s"
+
+#: builtin/index-pack.c:1744
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin no puede ser usada sin --stdin"
+
+#: builtin/index-pack.c:1746
+msgid "--stdin requires a git repository"
+msgstr "--stdin requiere un repositorio git"
+
+#: builtin/index-pack.c:1754
+msgid "--verify with no packfile name given"
+msgstr "--verify no recibió ningún nombre de archivo de paquete"
+
+#: builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "no se pudo definir '%s'"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "no se pudo definir template '%s'"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "no se puede abrir directorio '%s'"
+
+#: builtin/init-db.c:77
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "no se puede leer link '%s'"
+
+#: builtin/init-db.c:79
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "no se puede crear symlink '%s' '%s'"
+
+#: builtin/init-db.c:85
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "no se puede copiar '%s' a '%s'"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignorando template %s"
+
+#: builtin/init-db.c:120
+#, c-format
+msgid "templates not found %s"
+msgstr "no se encontraron templates %s"
+
+#: builtin/init-db.c:135
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "no se copian templates de '%s': %s"
+
+#: builtin/init-db.c:328
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "no es posible manejar el tipo de archivo %d"
+
+#: builtin/init-db.c:331
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "no se puede mover %s a %s"
+
+#: builtin/init-db.c:348 builtin/init-db.c:351
+#, c-format
+msgid "%s already exists"
+msgstr "%s ya existe"
+
+#: builtin/init-db.c:404
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
+
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Reinicializado el repositorio Git existente en %s%s\n"
+
+#: builtin/init-db.c:409
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
+
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Inicializado repositorio Git vacío en %s%s\n"
+
+#: builtin/init-db.c:458
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
+"shared[=<permisos>]] [<directorio>]"
+
+#: builtin/init-db.c:481
+msgid "permissions"
+msgstr "permisos"
+
+#: builtin/init-db.c:482
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"especifica que el repositorio de git será compartido entre varios usuarios"
+
+#: builtin/init-db.c:516 builtin/init-db.c:521
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "no se pude crear directorio %s"
+
+#: builtin/init-db.c:525
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "no se puede aplicar chdir a %s"
+
+#: builtin/init-db.c:546
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
+"dir=<directorio>)"
+
+#: builtin/init-db.c:574
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "No se puede acceder al árbol de trabajo '%s'"
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<valor>])...] [<archivo>...]"
+
+#: builtin/interpret-trailers.c:92
+msgid "edit files in place"
+msgstr "editar archivos en el lugar"
+
+#: builtin/interpret-trailers.c:93
+msgid "trim empty trailers"
+msgstr "cortar trailers vacíos"
+
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "donde colocar el nuevo trailer"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "acción if trailer ya existe"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "acción si falta el trailer"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "mostrar solo los trailers"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "no aplicar reglas de configuración"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "juntar valores con espacios en blanco contiguos"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "configurar opciones de análisis"
+
+#: builtin/interpret-trailers.c:107
+msgid "trailer"
+msgstr "trailer"
+
+#: builtin/interpret-trailers.c:108
+msgid "trailer(s) to add"
+msgstr "trailer(s) para agregar"
+
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer con --only-input no tiene sentido"
+
+#: builtin/interpret-trailers.c:127
+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
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
+
+#: builtin/log.c:47
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opciones>] <objeto>..."
+
+#: builtin/log.c:91
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "opción --decorate inválida: %s"
+
+#: builtin/log.c:148
+msgid "suppress diff output"
+msgstr "suprimir salida de diff"
+
+#: builtin/log.c:149
+msgid "show source"
+msgstr "mostrar fuente"
+
+#: builtin/log.c:150
+msgid "Use mail map file"
+msgstr "usar archivo de mapa de mail"
+
+#: builtin/log.c:151
+msgid "decorate options"
+msgstr "opciones de decorado"
+
+#: builtin/log.c:154
+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:250
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Salida final: %d %s\n"
+
+#: builtin/log.c:501
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: mal archivo"
+
+#: builtin/log.c:516 builtin/log.c:610
+#, c-format
+msgid "Could not read object %s"
+msgstr "No se pudo leer objeto %s"
+
+#: builtin/log.c:634
+#, c-format
+msgid "Unknown type: %d"
+msgstr "Tipo desconocido: %d"
+
+#: builtin/log.c:755
+msgid "format.headers without value"
+msgstr "formate.headers. sin valor"
+
+#: builtin/log.c:856
+msgid "name of output directory is too long"
+msgstr "nombre del directorio de salida es muy largo"
+
+#: builtin/log.c:872
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "No se puede abrir archivo patch %s"
+
+#: builtin/log.c:889
+msgid "Need exactly one range."
+msgstr "Exactamente un rango necesario."
+
+#: builtin/log.c:899
+msgid "Not a range."
+msgstr "No es un rango."
+
+#: builtin/log.c:1005
+msgid "Cover letter needs email format"
+msgstr "Letras de portada necesita formato email"
+
+#: builtin/log.c:1085
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "insano in-reply-to: %s"
+
+#: builtin/log.c:1112
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
+
+#: builtin/log.c:1162
+msgid "Two output directories?"
+msgstr "dos directorios de salida?"
+
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit desconocido %s"
+
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falló al resolver '%s' como una ref válida."
+
+#: builtin/log.c:1284
+msgid "Could not find exact merge base."
+msgstr "No se pudo encontrar una base de fusión."
+
+#: builtin/log.c:1288
+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 ""
+"Falló al conseguir upstream, si quiere grabar un commit base de manera "
+"automática,\n"
+"por favor use git branch --set-upstream-to para rastrear una rama remota.\n"
+"O puede especificar un commit base mediante --base=<id-commit-base> "
+"manualmente."
+
+#: builtin/log.c:1308
+msgid "Failed to find exact merge base"
+msgstr "Fallo al encontrar una base de fusión exacta"
+
+#: builtin/log.c:1319
+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:1323
+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:1372
+msgid "cannot get patch id"
+msgstr "no se puede obtener id de patch"
+
+#: builtin/log.c:1431
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "use [PATCH n/m] incluso con un único parche"
+
+#: builtin/log.c:1434
+msgid "use [PATCH] even with multiple patches"
+msgstr "use [PATCH] incluso con múltiples parches"
+
+#: builtin/log.c:1438
+msgid "print patches to standard out"
+msgstr "mostrar parches en standard out"
+
+#: builtin/log.c:1440
+msgid "generate a cover letter"
+msgstr "generar letra de cover"
+
+#: builtin/log.c:1442
+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:1443
+msgid "sfx"
+msgstr "sfx"
+
+#: builtin/log.c:1444
+msgid "use <sfx> instead of '.patch'"
+msgstr "use <sfx> en lugar de '.patch'"
+
+#: builtin/log.c:1446
+msgid "start numbering patches at <n> instead of 1"
+msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
+
+#: builtin/log.c:1448
+msgid "mark the series as Nth re-roll"
+msgstr "marcar las series como Nth re-roll"
+
+#: builtin/log.c:1450
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Use [RFC PATCH] en lugar de [PATCH]"
+
+#: builtin/log.c:1453
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "Use [<prefijo>] en lugar de [PATCH]"
+
+#: builtin/log.c:1456
+msgid "store resulting files in <dir>"
+msgstr "guardar archivos resultantes en <dir>"
+
+#: builtin/log.c:1459
+msgid "don't strip/add [PATCH]"
+msgstr "no cortar/agregar [PATCH]"
+
+#: builtin/log.c:1462
+msgid "don't output binary diffs"
+msgstr "no mostrar diffs binarios"
+
+#: builtin/log.c:1464
+msgid "output all-zero hash in From header"
+msgstr "salida como hash de todos-ceros en la cabecera From "
+
+#: builtin/log.c:1466
+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:1468
+msgid "show patch format instead of default (patch + stat)"
+msgstr "mostrar formato de parche en lugar del default (parche + stat)"
+
+#: builtin/log.c:1470
+msgid "Messaging"
+msgstr "Mensajeando"
+
+#: builtin/log.c:1471
+msgid "header"
+msgstr "cabezal"
+
+#: builtin/log.c:1472
+msgid "add email header"
+msgstr "agregar cabecera email"
+
+#: builtin/log.c:1473 builtin/log.c:1475
+msgid "email"
+msgstr "email"
+
+#: builtin/log.c:1473
+msgid "add To: header"
+msgstr "agregar cabecera To:"
+
+#: builtin/log.c:1475
+msgid "add Cc: header"
+msgstr "agregar cabecera Cc:"
+
+#: builtin/log.c:1477
+msgid "ident"
+msgstr "ident"
+
+#: builtin/log.c:1478
+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:1480
+msgid "message-id"
+msgstr "id de mensaje"
+
+#: builtin/log.c:1481
+msgid "make first mail a reply to <message-id>"
+msgstr "hacer primer mail una respuesta a <id de mensaje>"
+
+#: builtin/log.c:1482 builtin/log.c:1485
+msgid "boundary"
+msgstr "límite"
+
+#: builtin/log.c:1483
+msgid "attach the patch"
+msgstr "adjuntar el parche"
+
+#: builtin/log.c:1486
+msgid "inline the patch"
+msgstr "poner el parche en línea"
+
+#: builtin/log.c:1490
+msgid "enable message threading, styles: shallow, deep"
+msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
+
+#: builtin/log.c:1492
+msgid "signature"
+msgstr "firma"
+
+#: builtin/log.c:1493
+msgid "add a signature"
+msgstr "agregar una firma"
+
+#: builtin/log.c:1494
+msgid "base-commit"
+msgstr "commit-base"
+
+#: builtin/log.c:1495
+msgid "add prerequisite tree info to the patch series"
+msgstr "agregar pre requisito información de árbol a la serie de parches"
+
+#: builtin/log.c:1497
+msgid "add a signature from a file"
+msgstr "agregar una firma de un archivo"
+
+#: builtin/log.c:1498
+msgid "don't print the patch filenames"
+msgstr "no mostrar los nombres de archivos de los parches"
+
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "mostrar medidor de progreso mientras se generan los parches"
+
+#: builtin/log.c:1575
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "línea de ident inválida: %s"
+
+#: builtin/log.c:1590
+msgid "-n and -k are mutually exclusive."
+msgstr "-n y -k son mutuamente exclusivas."
+
+#: builtin/log.c:1592
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos."
+
+#: builtin/log.c:1600
+msgid "--name-only does not make sense"
+msgstr "--name-only no tiene sentido"
+
+#: builtin/log.c:1602
+msgid "--name-status does not make sense"
+msgstr "--name-status no tiene sentido"
+
+#: builtin/log.c:1604
+msgid "--check does not make sense"
+msgstr "--check no tiene sentido"
+
+#: builtin/log.c:1634
+msgid "standard output, or directory, which one?"
+msgstr "salida standard, o directorio, cual? "
+
+#: builtin/log.c:1636
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "No se pudo crear el directorio '%s'"
+
+#: builtin/log.c:1729
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "no se puede leer la firma del archivo '%s'"
+
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Generando parches"
+
+#: builtin/log.c:1805
+msgid "Failed to create output files"
+msgstr "Falló al crear los archivos de salida"
+
+#: builtin/log.c:1855
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
+
+#: builtin/log.c:1909
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"No se pudo encontrar una rama remota rastreada, por favor especifique "
+"<upstream> manualmente.\n"
+
+#: builtin/ls-files.c:466
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opciones>] [<archivo>...]"
+
+#: builtin/ls-files.c:515
+msgid "identify the file status with tags"
+msgstr "identifique el estado del archivo con tags"
+
+#: builtin/ls-files.c:517
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
+
+#: builtin/ls-files.c:519
+msgid "show cached files in the output (default)"
+msgstr "mostrar archivos en caché en la salida (default)"
+
+#: builtin/ls-files.c:521
+msgid "show deleted files in the output"
+msgstr "mostrar archivos borrados en la salida"
+
+#: builtin/ls-files.c:523
+msgid "show modified files in the output"
+msgstr "mostrar archivos modificados en la salida"
+
+#: builtin/ls-files.c:525
+msgid "show other files in the output"
+msgstr "mostrar otros archivos en la salida"
+
+#: builtin/ls-files.c:527
+msgid "show ignored files in the output"
+msgstr "mostrar archivos ignorados en la salida"
+
+#: builtin/ls-files.c:530
+msgid "show staged contents' object name in the output"
+msgstr ""
+"mostrar contenido de nombres de objetos en el área de stage en la salida"
+
+#: builtin/ls-files.c:532
+msgid "show files on the filesystem that need to be removed"
+msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
+
+#: builtin/ls-files.c:534
+msgid "show 'other' directories' names only"
+msgstr "mostrar solo nombres de 'directorios otros'"
+
+#: builtin/ls-files.c:536
+msgid "show line endings of files"
+msgstr "mostrar finales de línea de archivos"
+
+#: builtin/ls-files.c:538
+msgid "don't show empty directories"
+msgstr "no mostrar directorios vacíos"
+
+#: builtin/ls-files.c:541
+msgid "show unmerged files in the output"
+msgstr "mostrar archivos no fusionados en la salida"
+
+#: builtin/ls-files.c:543
+msgid "show resolve-undo information"
+msgstr "mostrar información resolver-deshacer"
+
+#: builtin/ls-files.c:545
+msgid "skip files matching pattern"
+msgstr "saltar archivos que concuerden con el patrón"
+
+#: builtin/ls-files.c:548
+msgid "exclude patterns are read from <file>"
+msgstr "excluir patrones leídos de <archivo>"
+
+#: builtin/ls-files.c:551
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+"leer patrones de exclusión de manera adicional por directorio en <archivo>"
+
+#: builtin/ls-files.c:553
+msgid "add the standard git exclusions"
+msgstr "agregar las exclusiones standard de git"
+
+#: builtin/ls-files.c:556
+msgid "make the output relative to the project top directory"
+msgstr "hacer la salidad relativa al directorio principal del proyecto"
+
+#: builtin/ls-files.c:559
+msgid "recurse through submodules"
+msgstr "recurrir a través de submódulos"
+
+#: builtin/ls-files.c:561
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
+
+#: builtin/ls-files.c:562
+msgid "tree-ish"
+msgstr "arbol-ismo"
+
+#: builtin/ls-files.c:563
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+"fingir que las rutas han sido borradas ya que todavía hay <arbol-ismos> "
+"presentes"
+
+#: builtin/ls-files.c:565
+msgid "show debugging data"
+msgstr "mostrar data de debug"
+
+#: builtin/ls-remote.c:7
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repositorio> [<refs>...]]"
+
+#: builtin/ls-remote.c:52
+msgid "do not print remote URL"
+msgstr "no mostrar el URL remoto"
+
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+msgid "exec"
+msgstr "ejecutar"
+
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+msgid "path of git-upload-pack on the remote host"
+msgstr "ruta de git-upload-pack en el host remoto"
+
+#: builtin/ls-remote.c:58
+msgid "limit to tags"
+msgstr "limitar a tags"
+
+#: builtin/ls-remote.c:59
+msgid "limit to heads"
+msgstr "limitar a heads"
+
+#: builtin/ls-remote.c:60
+msgid "do not show peeled tags"
+msgstr "no mostrar tags pelados"
+
+#: builtin/ls-remote.c:62
+msgid "take url.<base>.insteadOf into account"
+msgstr "tomar url.<base>.insteadOf en cuenta"
+
+#: builtin/ls-remote.c:64
+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
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
+
+#: builtin/ls-tree.c:29
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opciones>] <arbol-ismo> [<ruta>...]"
+
+#: builtin/ls-tree.c:127
+msgid "only show trees"
+msgstr "solo mostrar árboles"
+
+#: builtin/ls-tree.c:129
+msgid "recurse into subtrees"
+msgstr "recurrir en subárboles"
+
+#: builtin/ls-tree.c:131
+msgid "show trees when recursing"
+msgstr "mostrar árboles cuando se recurre"
+
+#: builtin/ls-tree.c:134
+msgid "terminate entries with NUL byte"
+msgstr "terminar entradas con byte NUL"
+
+#: builtin/ls-tree.c:135
+msgid "include object size"
+msgstr "incluir tamaño de objeto"
+
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+msgid "list only filenames"
+msgstr "listar solo nombres de archivos"
+
+#: builtin/ls-tree.c:142
+msgid "use full path names"
+msgstr "usar rutas completas"
+
+#: builtin/ls-tree.c:144
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+"mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "mbox vacío: '%s'"
+
+#: builtin/merge.c:48
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opciones>] [<commit>...]"
+
+#: builtin/merge.c:49
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:50
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:107
+msgid "switch `m' requires a value"
+msgstr "cambiar `m' requiere un valor"
+
+#: builtin/merge.c:144
+#, 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
+#, c-format
+msgid "Available strategies are:"
+msgstr "Estrategias disponibles son:"
+
+#: builtin/merge.c:150
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Estrategias personalizadas disponibles son:"
+
+#: builtin/merge.c:200 builtin/pull.c:134
+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:137
+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:140
+msgid "(synonym to --stat)"
+msgstr "(sinónimo para --stat)"
+
+#: builtin/merge.c:206 builtin/pull.c:143
+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:146
+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:149
+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:152
+msgid "edit message before committing"
+msgstr "editar mensaje antes de realizar commit"
+
+#: builtin/merge.c:214
+msgid "allow fast-forward (default)"
+msgstr "permitir fast-forwars (default)"
+
+#: builtin/merge.c:216 builtin/pull.c:158
+msgid "abort if fast-forward is not possible"
+msgstr "abortar si fast-forward no es posible"
+
+#: builtin/merge.c:220 builtin/pull.c:161
+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:165
+#: builtin/revert.c:109
+msgid "strategy"
+msgstr "estrategia"
+
+#: builtin/merge.c:222 builtin/pull.c:166
+msgid "merge strategy to use"
+msgstr "estrategia de fusión para usar"
+
+#: builtin/merge.c:223 builtin/pull.c:169
+msgid "option=value"
+msgstr "opción=valor"
+
+#: builtin/merge.c:224 builtin/pull.c:170
+msgid "option for selected merge strategy"
+msgstr "opción para la estrategia de fusión seleccionada"
+
+#: builtin/merge.c:226
+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
+msgid "abort the current in-progress merge"
+msgstr "abortar la fusión en progreso actual"
+
+#: builtin/merge.c:232
+msgid "continue the current in-progress merge"
+msgstr "continuar la fusión en progreso actual"
+
+#: builtin/merge.c:234 builtin/pull.c:177
+msgid "allow merging unrelated histories"
+msgstr "permitir fusionar historias no relacionadas"
+
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "verificar el hook commit-msg"
+
+#: builtin/merge.c:265
+msgid "could not run stash."
+msgstr "no se pudo ejecutar stash."
+
+#: builtin/merge.c:270
+msgid "stash failed"
+msgstr "stash falló"
+
+#: builtin/merge.c:275
+#, c-format
+msgid "not a valid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/merge.c:297 builtin/merge.c:314
+msgid "read-tree failed"
+msgstr "lectura de árbol falló"
+
+#: builtin/merge.c:344
+msgid " (nothing to squash)"
+msgstr " (nada para hacer squash)"
+
+#: builtin/merge.c:355
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit de squash -- no actualizando HEAD\n"
+
+#: builtin/merge.c:405
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
+
+#: builtin/merge.c:456
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' no apunta a ninguna confirmación"
+
+#: builtin/merge.c:546
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Mal string branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:666
+msgid "Not handling anything other than two heads merge."
+msgstr "No manejando nada más que fusión de dos heads."
+
+#: builtin/merge.c:680
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opción desconocida para merge-recursive: -X%s"
+
+#: builtin/merge.c:695
+#, c-format
+msgid "unable to write %s"
+msgstr "no es posible escribit %s"
+
+#: builtin/merge.c:747
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "No se puedo leer de '%s'"
+
+#: builtin/merge.c:756
+#, 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:762
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"esta fusión,\n"
+"especialmente si esto fusiona un upstream actualizado en una rama de "
+"tópico.\n"
+"\n"
+"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
+"el commit.\n"
+
+#: builtin/merge.c:798
+msgid "Empty commit message."
+msgstr "Mensaje de commit vacío."
+
+#: builtin/merge.c:818
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Maravilloso.\n"
+
+#: builtin/merge.c:871
+#, 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:910
+msgid "No current branch."
+msgstr "No rama actual."
+
+#: builtin/merge.c:912
+msgid "No remote for the current branch."
+msgstr "No hay remoto para la rama actual."
+
+#: builtin/merge.c:914
+msgid "No default upstream defined for the current branch."
+msgstr "No hay upstream default definido para la rama actual."
+
+#: builtin/merge.c:919
+#, 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:972
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Mal valor '%s' en el entorno '%s'"
+
+#: builtin/merge.c:1073
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "nada que podamos fusionar en %s: %s"
+
+#: builtin/merge.c:1107
+msgid "not something we can merge"
+msgstr "nada que podamos fusionar"
+
+#: builtin/merge.c:1172
+msgid "--abort expects no arguments"
+msgstr "--abort no espera argumentos"
+
+#: builtin/merge.c:1176
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
+
+#: builtin/merge.c:1188
+msgid "--continue expects no arguments"
+msgstr "--continue no espera argumentos"
+
+#: builtin/merge.c:1192
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
+
+#: builtin/merge.c:1208
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1215
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1218
+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:1227
+msgid "You cannot combine --squash with --no-ff."
+msgstr "No se puede combinar --squash con --no-ff."
+
+#: builtin/merge.c:1235
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"No hay commit especificado y merge.defaultToUpstream no está configurado."
+
+#: builtin/merge.c:1252
+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:1254
+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:1259
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - nada que podamos fusionar"
+
+#: builtin/merge.c:1261
+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:1295
+#, 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:1298
+#, 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:1301
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s no tiene una firma GPG."
+
+#: builtin/merge.c:1304
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Commit %s titene una buena firma GPG por %s\n"
+
+#: builtin/merge.c:1366
+msgid "refusing to merge unrelated histories"
+msgstr "rehusando fusionar historias no relacionadas"
+
+#: builtin/merge.c:1375
+msgid "Already up to date."
+msgstr "Ya está actualizado."
+
+#: builtin/merge.c:1385
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Actualizando %s..%s\n"
+
+#: builtin/merge.c:1426
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Intentando fusión en índice realmente trivial...\n"
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "Nope.\n"
+msgstr "Nop.\n"
+
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
+msgstr "Ya está actualizado. ¡Oh, yeaahh!"
+
+#: builtin/merge.c:1464
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: builtin/merge.c:1487 builtin/merge.c:1566
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Rebobinando el árbol a original...\n"
+
+#: builtin/merge.c:1491
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Intentando estrategia de fusión %s...\n"
+
+#: builtin/merge.c:1557
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
+
+#: builtin/merge.c:1559
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Fusionar con estrategia %s falló.\n"
+
+#: builtin/merge.c:1568
+#, 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:1580
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Fusión automática fue bien; detenida antes del commit como se solicitó\n"
+
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:31
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:32
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<commit>]"
+
+#: builtin/merge-base.c:218
+msgid "output all common ancestors"
+msgstr "mostrar todos los ancestros comunes"
+
+#: builtin/merge-base.c:220
+msgid "find ancestors for a single n-way merge"
+msgstr "encontrar ancestros para una única fusión de n-vías "
+
+#: builtin/merge-base.c:222
+msgid "list revs not reachable from others"
+msgstr "listar revs no alcanzables desde otros"
+
+#: builtin/merge-base.c:224
+msgid "is the first one ancestor of the other?"
+msgstr "es el primer ancestro del otro?"
+
+#: builtin/merge-base.c:226
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "encontrar donde <commit> forjó del reflog de <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
+"<archivo1> <archivo-origen> <archivo2>"
+
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+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 "
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr "por conflictos, usar nuestra versión"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr "por conflictos, usar la versión de ellos"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr "por conflictos, usar una versión de unión"
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr "por conflictos, usar el tamaño de este marcador"
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr "no advertir sobre conflictos"
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
+msgstr "configurar labels para archivo1/orig-archivo/archivo2"
+
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "opción %s desconocida"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no se pudo analizar el objeto '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
+msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "no manejando nada distinto a fusiones de dos heads."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no se pudo resolver ref '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusionando %s con %s\n"
+
+#: builtin/mktree.c:65
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:153
+msgid "input is NUL terminated"
+msgstr "input es terminada con NUL"
+
+#: builtin/mktree.c:154 builtin/write-tree.c:25
+msgid "allow missing objects"
+msgstr "permitir objetos faltantes"
+
+#: builtin/mktree.c:155
+msgid "allow creation of more than one tree"
+msgstr "permitir la creación de más de un árbol"
+
+#: builtin/mv.c:17
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<opciones>] <fuente>... <destino>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Directorio %s está en el índice y no hay submódulo?"
+
+#: builtin/mv.c:85 builtin/rm.c:289
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
+"para proceder"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s está en el índice"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "forzar mover/renombrar incluso si el objetivo existe"
+
+#: builtin/mv.c:126
+msgid "skip move/rename errors"
+msgstr "saltar errores de mover/renombrar"
+
+#: builtin/mv.c:167
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "destino '%s' no es un directorio"
+
+#: builtin/mv.c:178
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
+
+#: builtin/mv.c:182
+msgid "bad source"
+msgstr "mala fuente"
+
+#: builtin/mv.c:185
+msgid "can not move directory into itself"
+msgstr "no se pude mover un directorio en sí mismo"
+
+#: builtin/mv.c:188
+msgid "cannot move directory over file"
+msgstr "no se puede mover un directorio dentro de un archivo"
+
+#: builtin/mv.c:197
+msgid "source directory is empty"
+msgstr "directorio de fuente está vacío"
+
+#: builtin/mv.c:222
+msgid "not under version control"
+msgstr "no se encuentra bajo control de versión "
+
+#: builtin/mv.c:225
+msgid "destination exists"
+msgstr "destino existe"
+
+#: builtin/mv.c:233
+#, c-format
+msgid "overwriting '%s'"
+msgstr "sobrescribiendo '%s'"
+
+#: builtin/mv.c:236
+msgid "Cannot overwrite"
+msgstr "No se puede sobrescribir"
+
+#: builtin/mv.c:239
+msgid "multiple sources for the same target"
+msgstr "múltiples fuentes para el mismo objetivo"
+
+#: builtin/mv.c:241
+msgid "destination directory does not exist"
+msgstr "el directorio de destino no existe"
+
+#: builtin/mv.c:248
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, fuente=%s, destino=%s"
+
+#: builtin/mv.c:269
+#, 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
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "fallo al renombrar '%s'"
+
+#: builtin/name-rev.c:338
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opciones>] <confirmación>..."
+
+#: builtin/name-rev.c:339
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opciones>] --all"
+
+#: builtin/name-rev.c:340
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<opciones>] --stdin"
+
+#: builtin/name-rev.c:395
+msgid "print only names (no SHA-1)"
+msgstr "imprimir sólo nombres (sin SHA-1)"
+
+#: builtin/name-rev.c:396
+msgid "only use tags to name the commits"
+msgstr "sólo usar etiquetas para nombrar confirmaciones"
+
+#: builtin/name-rev.c:398
+msgid "only use refs matching <pattern>"
+msgstr "solo usar refs que concuerden con <patrón>"
+
+#: builtin/name-rev.c:400
+msgid "ignore refs matching <pattern>"
+msgstr "ignorar refs que concuerden con <patrón>"
+
+#: builtin/name-rev.c:402
+msgid "list all commits reachable from all refs"
+msgstr ""
+"listar todas las confirmaciones alcanzables desde todas las referencias"
+
+#: builtin/name-rev.c:403
+msgid "read from stdin"
+msgstr "leer desde stdin"
+
+#: builtin/name-rev.c:404
+msgid "allow to print `undefined` names (default)"
+msgstr "permitir imprimir nombres `undefined` (predeterminado)"
+
+#: builtin/name-rev.c:410
+msgid "dereference tags in the input (internal use)"
+msgstr "desreferenciar etiquetas en la entrada (uso interno)"
+
+#: builtin/notes.c:26
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
+
+#: builtin/notes.c:27
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
+"<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
+"destino>"
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
+"| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
+
+#: builtin/notes.c:31
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
+
+#: builtin/notes.c:32
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
+"<referencia-de-notas>"
+
+#: builtin/notes.c:33
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:34
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]"
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <referencia-de-notas>] prune [-n | -v]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <referencia-de-notas>] get-ref"
+
+#: builtin/notes.c:42
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<objeto>]]"
+
+#: builtin/notes.c:47
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opciones>] [<objeto>]"
+
+#: builtin/notes.c:52
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>"
+
+#: builtin/notes.c:53
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..."
+
+#: builtin/notes.c:58
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opciones>] [<objeto>]"
+
+#: builtin/notes.c:63
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<objeto>]"
+
+#: builtin/notes.c:68
+msgid "git notes show [<object>]"
+msgstr "git notes show [<objeto>]"
+
+#: builtin/notes.c:73
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opciones>] <referencia-de-notas>"
+
+#: builtin/notes.c:74
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opciones>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opciones>]"
+
+#: builtin/notes.c:80
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<objeto>]"
+
+#: builtin/notes.c:85
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opciones>]"
+
+#: builtin/notes.c:90
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:95
+msgid "Write/edit the notes for the following object:"
+msgstr "Escribe/edita las notas para los siguientes objetos:"
+
+#: builtin/notes.c:148
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "incapaz de iniciar 'show' para el objeto '%s'"
+
+#: builtin/notes.c:152
+msgid "could not read 'show' output"
+msgstr "no se pudo leer salida de 'show'"
+
+#: builtin/notes.c:160
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "falló la finalización de 'show' para el objeto '%s'"
+
+#: builtin/notes.c:195
+msgid "please supply the note contents using either -m or -F option"
+msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
+
+#: builtin/notes.c:204
+msgid "unable to write note object"
+msgstr "incapaz de escribir el objeto de nota"
+
+#: builtin/notes.c:206
+#, c-format
+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
+#, c-format
+msgid "cannot read '%s'"
+msgstr "no se puede leer '%s'"
+
+#: builtin/notes.c:236 builtin/tag.c:503
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "no se pudo abrir o leer '%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
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "falló al resolver '%s' como ref válida."
+
+#: builtin/notes.c:258
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "falló al leer objeto '%s'."
+
+#: builtin/notes.c:262
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'."
+
+#: builtin/notes.c:302
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "línea de entrada mal formada: '%s'."
+
+#: builtin/notes.c:317
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "falló al copiar notas de '%s' a '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:349
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "rechazando %s notas en %s (fuera 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
+msgid "too many parameters"
+msgstr "demasiados parámetros"
+
+#: builtin/notes.c:382 builtin/notes.c:668
+#, c-format
+msgid "no note found for object %s."
+msgstr "no se encontraron notas para objeto %s."
+
+#: builtin/notes.c:403 builtin/notes.c:566
+msgid "note contents as a string"
+msgstr "contenidos de la nota como cadena"
+
+#: builtin/notes.c:406 builtin/notes.c:569
+msgid "note contents in a file"
+msgstr "contenidos de la nota en un archivo"
+
+#: builtin/notes.c:409 builtin/notes.c:572
+msgid "reuse and edit specified note object"
+msgstr "reutilizar y editar el objeto de nota especificada"
+
+#: builtin/notes.c:412 builtin/notes.c:575
+msgid "reuse specified note object"
+msgstr "reutilizar el objeto de nota especificado"
+
+#: builtin/notes.c:415 builtin/notes.c:578
+msgid "allow storing empty note"
+msgstr "permitir almacenar nota vacía"
+
+#: builtin/notes.c:416 builtin/notes.c:487
+msgid "replace existing notes"
+msgstr "reemplazar notas existentes"
+
+#: builtin/notes.c:441
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
+"'-f' para sobrescribir las notas existentes"
+
+#: builtin/notes.c:456 builtin/notes.c:535
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Sobrescribiendo notas existentes para objeto %s\n"
+
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Removiendo nota para objeto %s\n"
+
+#: builtin/notes.c:488
+msgid "read objects from stdin"
+msgstr "leer objetos desde stdin"
+
+#: builtin/notes.c:490
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
+
+#: builtin/notes.c:508
+msgid "too few parameters"
+msgstr "muy pocos parámetros"
+
+#: builtin/notes.c:529
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
+"Use '-f' para sobrescribir las notes existentes"
+
+#: builtin/notes.c:541
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
+
+#: builtin/notes.c:593
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
+"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
+
+#: builtin/notes.c:688
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:690
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "falló al borrar ref NOTES_MERGE_REF"
+
+#: builtin/notes.c:692
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
+
+#: builtin/notes.c:712
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:714
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:716
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:729
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "falló al resolver NOTES_MERGE_REF"
+
+#: builtin/notes.c:732
+msgid "failed to finalize notes merge"
+msgstr "falló al finalizar las notas de fusión"
+
+#: builtin/notes.c:758
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "estrategia de fusión de notas %s desconocida"
+
+#: builtin/notes.c:774
+msgid "General options"
+msgstr "Opciones generales"
+
+#: builtin/notes.c:776
+msgid "Merge options"
+msgstr "Opciones de fusión"
+
+#: builtin/notes.c:778
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
+"theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:780
+msgid "Committing unmerged notes"
+msgstr "Realizando commit a las notas no fusionadas"
+
+#: builtin/notes.c:782
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+"finalizar fusión de notas realizando un commit de las notas no fusionadas"
+
+#: builtin/notes.c:784
+msgid "Aborting notes merge resolution"
+msgstr "Abortando notas de resolución de fusión"
+
+#: builtin/notes.c:786
+msgid "abort notes merge"
+msgstr "abortar notas de fusión"
+
+#: builtin/notes.c:797
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
+
+#: builtin/notes.c:802
+msgid "must specify a notes ref to merge"
+msgstr "debe espeficiar una ref de notas a fusionar"
+
+#: builtin/notes.c:826
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "--strategy/-s desconocida: %s"
+
+#: builtin/notes.c:863
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "una fusión de notas en %s ya está en progreso en %s"
+
+#: builtin/notes.c:866
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "falló al guardar un link para el ref de notas 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"
+msgstr ""
+"Fusión automática de notas falló. Arregle conflictos en %s y realice un "
+"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
+"'git notes merge --abort'.\n"
+
+#: builtin/notes.c:890
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "El objeto %s no tiene notas\n"
+
+#: builtin/notes.c:902
+msgid "attempt to remove non-existent note is not an error"
+msgstr "intentar remover una nota no existente no es un error"
+
+#: builtin/notes.c:905
+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:146
+msgid "do not remove, show only"
+msgstr "no remover, solo mostrar"
+
+#: builtin/notes.c:944
+msgid "report pruned notes"
+msgstr "reportar notas recortadas"
+
+#: builtin/notes.c:986
+msgid "notes-ref"
+msgstr "referencia-de-notas"
+
+#: builtin/notes.c:987
+msgid "use notes from <notes-ref>"
+msgstr "usar notas desde <referencia-de-notas>"
+
+#: builtin/notes.c:1022
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
+#: builtin/pack-objects.c:31
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
+"objetos>]"
+
+#: builtin/pack-objects.c:32
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
+"de-objetos>]"
+
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
+#, c-format
+msgid "deflate error (%d)"
+msgstr "error al desinflar (%d)"
+
+#: builtin/pack-objects.c:777
+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:790
+msgid "Writing objects"
+msgstr "Escribiendo objetos"
+
+#: builtin/pack-objects.c:1070
+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:2440
+msgid "Compressing objects"
+msgstr "Comprimiendo objetos"
+
+#: builtin/pack-objects.c:2849
+#, c-format
+msgid "unsupported index version %s"
+msgstr "versión de índice no soportada %s"
+
+#: builtin/pack-objects.c:2853
+#, c-format
+msgid "bad index version '%s'"
+msgstr "mala versión del índice '%s'"
+
+#: builtin/pack-objects.c:2883
+msgid "do not show progress meter"
+msgstr "no mostrar medidor de progreso"
+
+#: builtin/pack-objects.c:2885
+msgid "show progress meter"
+msgstr "mostrar medidor de progreso"
+
+#: builtin/pack-objects.c:2887
+msgid "show progress meter during object writing phase"
+msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
+
+#: builtin/pack-objects.c:2890
+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:2891
+msgid "version[,offset]"
+msgstr "versión[,offset]"
+
+#: builtin/pack-objects.c:2892
+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:2895
+msgid "maximum size of each output pack file"
+msgstr "tamaño máximo de cada paquete resultante"
+
+#: builtin/pack-objects.c:2897
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ignorar objetos prestados de otros almacenes de objetos"
+
+#: builtin/pack-objects.c:2899
+msgid "ignore packed objects"
+msgstr "ignorar objetos paquete"
+
+#: builtin/pack-objects.c:2901
+msgid "limit pack window by objects"
+msgstr "limitar ventana de paquete por objetos"
+
+#: builtin/pack-objects.c:2903
+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:2905
+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:2907
+msgid "reuse existing deltas"
+msgstr "reusar deltas existentes"
+
+#: builtin/pack-objects.c:2909
+msgid "reuse existing objects"
+msgstr "reutilizar objetos existentes"
+
+#: builtin/pack-objects.c:2911
+msgid "use OFS_DELTA objects"
+msgstr "usar objetos OFS_DELTA"
+
+#: builtin/pack-objects.c:2913
+msgid "use threads when searching for best delta matches"
+msgstr "usar hilos cuando se busque para mejores concordancias de delta"
+
+#: builtin/pack-objects.c:2915
+msgid "do not create an empty pack output"
+msgstr "no crear un paquete resultante vacío"
+
+#: builtin/pack-objects.c:2917
+msgid "read revision arguments from standard input"
+msgstr "leer argumentos de revisión de standard input"
+
+#: builtin/pack-objects.c:2919
+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:2922
+msgid "include objects reachable from any reference"
+msgstr "incluir objetos alcanzables por cualquier referencia"
+
+#: builtin/pack-objects.c:2925
+msgid "include objects referred by reflog entries"
+msgstr "incluir objetos referidos por entradas de reflog"
+
+#: builtin/pack-objects.c:2928
+msgid "include objects referred to by the index"
+msgstr "incluir objetos referidos por el índice"
+
+#: builtin/pack-objects.c:2931
+msgid "output pack to stdout"
+msgstr "mostrar paquete en stdout"
+
+#: builtin/pack-objects.c:2933
+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:2935
+msgid "keep unreachable objects"
+msgstr "mantener objetos inalcanzables"
+
+#: builtin/pack-objects.c:2937
+msgid "pack loose unreachable objects"
+msgstr "empaquetar objetos sueltos inalcanzables"
+
+#: builtin/pack-objects.c:2939
+msgid "unpack unreachable objects newer than <time>"
+msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
+
+#: builtin/pack-objects.c:2942
+msgid "create thin packs"
+msgstr "crear paquetes delgados"
+
+#: builtin/pack-objects.c:2944
+msgid "create packs suitable for shallow fetches"
+msgstr "crear paquetes adecuados para fetches superficiales"
+
+#: builtin/pack-objects.c:2946
+msgid "ignore packs that have companion .keep file"
+msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
+
+#: builtin/pack-objects.c:2948
+msgid "pack compression level"
+msgstr "nivel de compresión del paquete"
+
+#: builtin/pack-objects.c:2950
+msgid "do not hide commits by grafts"
+msgstr "no ocultar commits por injertos"
+
+#: builtin/pack-objects.c:2952
+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:2954
+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:3081
+msgid "Counting objects"
+msgstr "Contando objetos"
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<opciones>]"
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr "empaquetar todo"
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr "recortar refs perdidos (default)"
+
+#: builtin/prune-packed.c:8
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:41
+msgid "Removing duplicate objects"
+msgstr "Removiendo objetos duplicados"
+
+#: builtin/prune.c:11
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--expire <tiempo>] [--] [<head>...]"
+
+#: builtin/prune.c:106
+msgid "report pruned objects"
+msgstr "reportar objetos recortados"
+
+#: builtin/prune.c:109
+msgid "expire objects older than <time>"
+msgstr "expirar objetos más viejos a <tiempo>"
+
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "no se puede recortar en un repositorio de objetos-preciosos"
+
+#: builtin/pull.c:54 builtin/pull.c:56
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valor inválido para %s: %s"
+
+#: builtin/pull.c:76
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+"git pull [<opciones>] [<repositorio> [<especificacion-de-referencia>...]]"
+
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "control de fetch recursivo en submódulos"
+
+#: builtin/pull.c:128
+msgid "Options related to merging"
+msgstr "Opciones relacionadas a fusión"
+
+#: builtin/pull.c:131
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "incorporar cambios por rebase en lugar de fusión"
+
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
+msgid "allow fast-forward"
+msgstr "permitir fast-forward"
+
+#: builtin/pull.c:164
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
+
+#: builtin/pull.c:180
+msgid "Options related to fetching"
+msgstr "Opciones relacionadas a fetch"
+
+#: builtin/pull.c:198
+msgid "number of submodules pulled in parallel"
+msgstr "número de submódules que realizan pull en paralelo"
+
+#: builtin/pull.c:287
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "valor inválido para pull.ff: %s"
+
+#: builtin/pull.c:403
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
+
+#: builtin/pull.c:405
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"No hay candidatos para fusionar entre las refs que has bajado con fetch."
+
+#: builtin/pull.c:406
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Generalmente esto significa que has proveído un wildcard de refspec que no "
+"tiene\n"
+"concordancia en el final remoto."
+
+#: builtin/pull.c:409
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"Se ha solicitado un pull del remoto '%s', pero no se ha especificado\n"
+"una rama. Porque este no es el remoto configurado por default\n"
+"para tu rama actual, tienes que especificar una rama en la línea de comando."
+
+#: builtin/pull.c:414 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "No te encuentras actualmente en la rama."
+
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "Por favor especifica a qué rama quieres rebasar."
+
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "Por favor especifica a qué rama quieres fusionar."
+
+#: builtin/pull.c:419 builtin/pull.c:434
+msgid "See git-pull(1) for details."
+msgstr "Ver git-pull(1) para detalles."
+
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remoto>"
+
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<rama>"
+
+#: builtin/pull.c:429 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "No hay información de rastreo para la rama 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 deseas configurar el rastreo de información para esta rama, puedes "
+"hacerlo con:"
+
+#: builtin/pull.c:443
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+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:796
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignorando --verify-signatures para rebase"
+
+#: builtin/pull.c:844
+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:852
+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:855
+msgid "pull with rebase"
+msgstr "pull con rebase"
+
+#: builtin/pull.c:856
+msgid "please commit or stash them."
+msgstr "por favor realiza un commit o un stash con ellos."
+
+#: builtin/pull.c:881
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch actualizó el head de la rama actual.\n"
+"realizando fast-forward al árbol de trabajo\n"
+"desde commit %s."
+
+#: builtin/pull.c:886
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"No se puede realizar fast-forward en tu árbol de trabajo.\n"
+"Tras asegurarse que ha guardado todo lo preciado de la salida de\n"
+"$ git diff %s\n"
+",ejecute\n"
+"$ git reset --hard\n"
+"para recuperar."
+
+#: builtin/pull.c:901
+msgid "Cannot merge multiple branches into empty head."
+msgstr "No se puede fusionar múltiples ramas en un head vacío."
+
+#: builtin/pull.c:905
+msgid "Cannot rebase onto multiple branches."
+msgstr "No se puede rebasar en multiples ramas."
+
+#: builtin/pull.c:912
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"no se puede rebasar con modificaciones de submódulos grabadas localmente"
+
+#: builtin/push.c:17
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+"git push [<opciones>] [<repositorio> [<especificaciones-de-refrencia>...]]"
+
+#: builtin/push.c:90
+msgid "tag shorthand without <tag>"
+msgstr "taquigrafía de tag sin <tag>"
+
+#: builtin/push.c:100
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete solo acepta como objetivos nombres de ref planos"
+
+#: builtin/push.c:144
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Para elegir si la opcion es permanente, mira push.default en 'git help "
+"config'."
+
+#: builtin/push.c:147
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s %s\n"
+"%s"
+msgstr ""
+"La rama upstream de tu rama actual no concuerda\n"
+"con el nombre de tu rama actual. Para hacer un push a la rama upstream\n"
+"en el remoto, ejecuta\n"
+"\n"
+"\tgit push %s HEAD:%s\n"
+"\n"
+"Para hacer un push a la rama del mismo nombre en el remoto, ejecuta\n"
+"\n"
+"\tgit push %s %s\n"
+"%s"
+
+#: builtin/push.c:162
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"Actualmente no estás en una rama.\n"
+"Para hacer un push a la historia que lleva al estado actual\n"
+"(HEAD desacoplado), use\n"
+"\n"
+"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
+
+#: builtin/push.c:176
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"La rama actual %s no tiene una rama upstream.\n"
+"Para realizar un push de la rama actual y configurar el remoto como "
+"upstream, use\n"
+"\n"
+"\tgit push --set-upstream %s %s\n"
+
+#: builtin/push.c:184
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
+
+#: builtin/push.c:187
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"Está haciendo un push al remoto '%s', el cual no es el upstream de\n"
+"su rama actual '%s', sin decirme qué poner en el push\n"
+"para actualizar en qué rama de remoto."
+
+#: builtin/push.c:246
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
+
+#: builtin/push.c:253
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Actualizaciones fueron rechazadas porque la punta de tu rama actual esta\n"
+"detras de su contraparte remota. Integra los cambios remotos (es decir\n"
+"'git pull ...') antes de hacer push de nuevo.\n"
+"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
+
+#: builtin/push.c:259
+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"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Actualizaciones fueron rechazadas porque una punta de rama en el push está \n"
+"detrás de su contraparte remota. Verifique esta rama e integre los cambios "
+"remotos\n"
+"(ejem. 'git pull ...') antes de volver a hacer push.\n"
+"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
+
+#: builtin/push.c:265
+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"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n"
+"no existe localmente. Esto es causado usuallmente por otro repositorio \n"
+"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n"
+"remotos (ejem. 'git pull ...') antes de volver a hacer push.\n"
+"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
+
+#: builtin/push.c:272
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
+
+#: builtin/push.c:275
+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"
+"without using the '--force' option.\n"
+msgstr ""
+"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
+"o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
+"sin usar la opción '--force'.\n"
+
+#: builtin/push.c:335
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Hacienod push a %s\n"
+
+#: builtin/push.c:339
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "fallo el push de algunas referencias a '%s'"
+
+#: builtin/push.c:370
+#, c-format
+msgid "bad repository '%s'"
+msgstr "mal repositorio '%s'"
+
+#: builtin/push.c:371
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"No se ha configurado un destino para el push.\n"
+"Puedes o especificar una URL desde la linea de comandos o configurar "
+"unrepositorio remoto usando\n"
+"\n"
+"    git remote add <nombre> <url>\n"
+"\n"
+"y luego haciendo push al nombre del remoto\n"
+"\n"
+"    git push <nombre>\n"
+
+#: builtin/push.c:389
+msgid "--all and --tags are incompatible"
+msgstr "--all y --tags son incompatibles"
+
+#: builtin/push.c:390
+msgid "--all can't be combined with refspecs"
+msgstr "--all no puede ser combinada con refspecs"
+
+#: builtin/push.c:395
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror y --tags son incompatibles"
+
+#: builtin/push.c:396
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror no puede ser combinado con refspecs"
+
+#: builtin/push.c:401
+msgid "--all and --mirror are incompatible"
+msgstr "--all y --mirror son incompatibles"
+
+#: builtin/push.c:523
+msgid "repository"
+msgstr "repositorio"
+
+#: builtin/push.c:524 builtin/send-pack.c:163
+msgid "push all refs"
+msgstr "realizar push a todas las refs"
+
+#: builtin/push.c:525 builtin/send-pack.c:165
+msgid "mirror all refs"
+msgstr "realizar mirror a todas las refs"
+
+#: builtin/push.c:527
+msgid "delete refs"
+msgstr "borrar refs"
+
+#: builtin/push.c:528
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
+
+#: builtin/push.c:531 builtin/send-pack.c:166
+msgid "force updates"
+msgstr "forzar actualizaciones"
+
+#: builtin/push.c:533 builtin/send-pack.c:180
+msgid "refname>:<expect"
+msgstr "refname>:<expect"
+
+#: builtin/push.c:534 builtin/send-pack.c:181
+msgid "require old value of ref to be at this value"
+msgstr "requiere haber valor viejo de ref en este valor"
+
+#: builtin/push.c:537
+msgid "control recursive pushing of submodules"
+msgstr "controlar push recursivo de submódulos"
+
+#: builtin/push.c:539 builtin/send-pack.c:174
+msgid "use thin pack"
+msgstr "usar empaquetado delgado"
+
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
+msgid "receive pack program"
+msgstr "recibir programa de paquete"
+
+#: builtin/push.c:542
+msgid "set upstream for git pull/status"
+msgstr "configurar upstream para git pulll/status"
+
+#: builtin/push.c:545
+msgid "prune locally removed refs"
+msgstr "recortando refs removidas localmente"
+
+#: builtin/push.c:547
+msgid "bypass pre-push hook"
+msgstr "hacer un bypass al hook pre-push"
+
+#: builtin/push.c:548
+msgid "push missing but relevant tags"
+msgstr "realizar push de tags faltantes pero relevantes"
+
+#: builtin/push.c:551 builtin/send-pack.c:168
+msgid "GPG sign the push"
+msgstr "firmar con GPG el push"
+
+#: builtin/push.c:553 builtin/send-pack.c:175
+msgid "request atomic transaction on remote side"
+msgstr "solicitar transacción atómica en el lado remoto"
+
+#: builtin/push.c:554 builtin/send-pack.c:171
+msgid "server-specific"
+msgstr "especifico-de-servidor"
+
+#: builtin/push.c:554 builtin/send-pack.c:172
+msgid "option to transmit"
+msgstr "opción para trasmitir"
+
+#: builtin/push.c:568
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete es incompatible con --all, --mirror y --tags"
+
+#: builtin/push.c:570
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete no tiene sentido sin ninguna referencia"
+
+#: builtin/push.c:589
+msgid "push options must not have new line characters"
+msgstr "opciones de push no pueden tener caracteres de línea nueva"
+
+#: 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>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<archivo>] (--empty | <arbol-ismo1> [<arbol-"
+"ismo2> [<arbol-ismo3>]])"
+
+#: builtin/read-tree.c:121
+msgid "write resulting index to <file>"
+msgstr "escribir índice resultante en <archivo>"
+
+#: builtin/read-tree.c:124
+msgid "only empty the index"
+msgstr "solo vaciar el índice"
+
+#: builtin/read-tree.c:126
+msgid "Merging"
+msgstr "Fusionando"
+
+#: builtin/read-tree.c:128
+msgid "perform a merge in addition to a read"
+msgstr "realizar un merge en adición a una lectura"
+
+#: builtin/read-tree.c:130
+msgid "3-way merge if no file level merging required"
+msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
+
+#: builtin/read-tree.c:132
+msgid "3-way merge in presence of adds and removes"
+msgstr "fusión en 3-vías en presencia de adiciones y remociones"
+
+#: builtin/read-tree.c:134
+msgid "same as -m, but discard unmerged entries"
+msgstr "igual que -m, pero descarta entradas sin fusionar"
+
+#: builtin/read-tree.c:135
+msgid "<subdirectory>/"
+msgstr "<subdirectorio>/"
+
+#: builtin/read-tree.c:136
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "lea el árbol en el índice bajo <subdirectorio>/"
+
+#: builtin/read-tree.c:139
+msgid "update working tree with merge result"
+msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
+
+#: builtin/read-tree.c:141
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:142
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "permitir sobrescritura de archivos explícitamente ignorados"
+
+#: builtin/read-tree.c:145
+msgid "don't check the working tree after merging"
+msgstr "no revisar el árbol de trabajo tras fusionar"
+
+#: builtin/read-tree.c:146
+msgid "don't update the index or the work tree"
+msgstr "no actualizar el índice o el árbol de trabajo"
+
+#: builtin/read-tree.c:148
+msgid "skip applying sparse checkout filter"
+msgstr "saltar aplicado de filtro de sparse checkout"
+
+#: builtin/read-tree.c:150
+msgid "debug unpack-trees"
+msgstr "debug de árboles-desempacados"
+
+#: builtin/rebase--helper.c:8
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<opciones>]"
+
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "mantener commits vacíos"
+
+#: builtin/rebase--helper.c:23
+msgid "continue rebase"
+msgstr "continuar rebase"
+
+#: builtin/rebase--helper.c:25
+msgid "abort rebase"
+msgstr "abortar rebase"
+
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "generar script de rebase"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "SHA-1s cortos en la lista de pendientes"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "SHA-1s expandidos en la lista de pendientes"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "revisar la lista de pendientes"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "saltar los picks innecesarios"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "reorganizar líneas fixup/squash"
+
+#: builtin/receive-pack.c:29
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:839
+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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"Por default, actualizar la rama actual en un repositorio no vacío\n"
+"está denegado, porque eso haría el índice y el árbol de trabajo "
+"inconsistentes\n"
+"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para "
+"arreglar\n"
+"el árbol de trabajo con HEAD.\n"
+"\n"
+"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n"
+"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
+"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n"
+"se haya organizado para actualizar su árbol de trabajo para que coincida con "
+"lo que\n"
+"enviará con el push de otra manera.\n"
+"\n"
+"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
+"configure 'receive.denyCurrentBranch' a 'refuse'."
+
+#: builtin/receive-pack.c:859
+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"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"Por default, borrar la rama actual está denegado, porque el siguiente\n"
+"'git clone' no serultará en ningún archivo revisado, causando confusión.\n"
+"\n"
+"Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o "
+"'ignore'\n"
+"en el repositorio remoto para permitir borrar la rama actual.\n"
+"con o sin mensaje de advertencia.\n"
+"\n"
+"Para suprimir este mensaje, puede configurarlo en 'refuse'."
+
+#: builtin/receive-pack.c:1932
+msgid "quiet"
+msgstr "tranquilo"
+
+#: builtin/receive-pack.c:1946
+msgid "You must specify a directory."
+msgstr "Se tiene que especificar un directorio."
+
+#: builtin/reflog.c:424
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' para '%s' no es una marca de tiempo válida"
+
+#: builtin/reflog.c:541 builtin/reflog.c:546
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' no es una marca de tiempo válida"
+
+#: builtin/remote.c:13
+msgid "git remote [-v | --verbose]"
+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>"
+msgstr ""
+"git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nombre> <url>"
+
+#: builtin/remote.c:15 builtin/remote.c:35
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <viejo> <nuevo>"
+
+#: builtin/remote.c:16 builtin/remote.c:40
+msgid "git remote remove <name>"
+msgstr "git remote remove <nombre>"
+
+#: builtin/remote.c:17 builtin/remote.c:45
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
+
+#: builtin/remote.c:18
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nombre>"
+
+#: builtin/remote.c:19
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nombre>"
+
+#: builtin/remote.c:20
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
+
+#: builtin/remote.c:21
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nombre> <rama>..."
+
+#: builtin/remote.c:22 builtin/remote.c:71
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nombre>"
+
+#: builtin/remote.c:23 builtin/remote.c:76
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
+
+#: builtin/remote.c:24 builtin/remote.c:77
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nombre> <nuevo-url>"
+
+#: builtin/remote.c:25 builtin/remote.c:78
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nombre> <url>"
+
+#: builtin/remote.c:30
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opciones>] <nombre> <url>"
+
+#: builtin/remote.c:50
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nombre> <rama>..."
+
+#: builtin/remote.c:51
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nombre> <rama>..."
+
+#: builtin/remote.c:56
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opciones>] <nombre>"
+
+#: builtin/remote.c:61
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opciones>] <nombre>"
+
+#: builtin/remote.c:66
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
+
+#: builtin/remote.c:95
+#, c-format
+msgid "Updating %s"
+msgstr "Actualizando %s"
+
+#: builtin/remote.c:127
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"Usar --mirror es peligroso y está desaprobado;\n"
+"\t usa más bien --mirror=fetch o --mirror=push"
+
+#: builtin/remote.c:144
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "argumento mirror desconocido: %s"
+
+#: builtin/remote.c:160
+msgid "fetch the remote branches"
+msgstr "realizar fetch a las ramas remotas"
+
+#: builtin/remote.c:162
+msgid "import all tags and associated objects when fetching"
+msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
+
+#: builtin/remote.c:165
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "o no realziar fetch a ningún tag (--no-tags)"
+
+#: builtin/remote.c:167
+msgid "branch(es) to track"
+msgstr "rama(s) para rastrear"
+
+#: builtin/remote.c:168
+msgid "master branch"
+msgstr "rama master"
+
+#: builtin/remote.c:169
+msgid "push|fetch"
+msgstr "push|fetch"
+
+#: builtin/remote.c:170
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+"configurar remote como mirror para realizar push o desde el cual realizar "
+"fetch"
+
+#: builtin/remote.c:182
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "especificar una rama master no tiene sentido con --mirror"
+
+#: builtin/remote.c:184
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
+
+#: builtin/remote.c:191 builtin/remote.c:631
+#, c-format
+msgid "remote %s already exists."
+msgstr "remoto %s ya existe."
+
+#: builtin/remote.c:195 builtin/remote.c:635
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' no es un nombre remoto válido"
+
+#: builtin/remote.c:235
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "No se pudo configurar master '%s'"
+
+#: builtin/remote.c:337
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "No se pudo realizar el fetch al mapa para refspec %s"
+
+#: builtin/remote.c:438 builtin/remote.c:446
+msgid "(matching)"
+msgstr "(concordando)"
+
+#: builtin/remote.c:450
+msgid "(delete)"
+msgstr "(eliminar)"
+
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#, c-format
+msgid "No such remote: %s"
+msgstr "No existe el remoto: %s"
+
+#: builtin/remote.c:641
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
+
+#: builtin/remote.c:661
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"No se actualizan refspec de fetch no predeterminada\n"
+"\t%s\n"
+"\tPor favor actualice la configuración manualmente si es necesario."
+
+#: builtin/remote.c:697
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "borrando '%s' falló"
+
+#: builtin/remote.c:731
+#, c-format
+msgid "creating '%s' failed"
+msgstr "creando '%s' falló"
+
+#: builtin/remote.c:796
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n"
+"para borrarla, use:"
+msgstr[1] ""
+"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
+"removidas;\n"
+"para borrarlas, use:"
+
+#: builtin/remote.c:810
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "No se pudo borrar la sección de configuración '%s'"
+
+#: builtin/remote.c:911
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
+
+#: builtin/remote.c:914
+msgid " tracked"
+msgstr " rastreada"
+
+#: builtin/remote.c:916
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " viejo ( use 'git remote prune' para remover)"
+
+#: builtin/remote.c:918
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:959
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama"
+
+#: builtin/remote.c:967
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "rebasa interactivamente en remoto %s"
+
+#: builtin/remote.c:968
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "rebasa sobre el remoto %s"
+
+#: builtin/remote.c:971
+#, c-format
+msgid " merges with remote %s"
+msgstr " se fusiona con remoto %s"
+
+#: builtin/remote.c:974
+#, c-format
+msgid "merges with remote %s"
+msgstr "fusiona con remoto %s"
+
+#: builtin/remote.c:977
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s y con el remoto %s\n"
+
+#: builtin/remote.c:1020
+msgid "create"
+msgstr "crear"
+
+#: builtin/remote.c:1023
+msgid "delete"
+msgstr "borrar"
+
+#: builtin/remote.c:1027
+msgid "up to date"
+msgstr "actualizado"
+
+#: builtin/remote.c:1030
+msgid "fast-forwardable"
+msgstr "puede realizar fast-forward"
+
+#: builtin/remote.c:1033
+msgid "local out of date"
+msgstr "desactualizado local"
+
+#: builtin/remote.c:1040
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s fuerza a %-*s (%s)"
+
+#: builtin/remote.c:1043
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s publica a %-*s (%s)"
+
+#: builtin/remote.c:1047
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s fuerza a %s"
+
+#: builtin/remote.c:1050
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s publica a %s"
+
+#: builtin/remote.c:1118
+msgid "do not query remotes"
+msgstr "no consultar remotos"
+
+#: builtin/remote.c:1145
+#, c-format
+msgid "* remote %s"
+msgstr "* remoto %s"
+
+#: builtin/remote.c:1146
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  URL  para obtener: %s"
+
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
+msgid "(no URL)"
+msgstr "(sin URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1161 builtin/remote.c:1163
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  URL para publicar: %s"
+
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  Rama HEAD: %s"
+
+#: builtin/remote.c:1165
+msgid "(not queried)"
+msgstr "(no consultado)"
+
+#: builtin/remote.c:1167
+msgid "(unknown)"
+msgstr "(desconocido)"
+
+#: builtin/remote.c:1171
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
+
+#: builtin/remote.c:1183
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  Rama remota:%s"
+msgstr[1] "  Ramas remotas:%s"
+
+#: builtin/remote.c:1186 builtin/remote.c:1212
+msgid " (status not queried)"
+msgstr " (estado no consultado)"
+
+#: builtin/remote.c:1195
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  Rama local configurada para 'git pull':"
+msgstr[1] "  Ramas locales configuradas para 'git pull':"
+
+#: builtin/remote.c:1203
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Las referencias locales serán reflejadas por 'git push'"
+
+#: builtin/remote.c:1209
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "  Referencia local configurada para 'git push'%s:"
+msgstr[1] "  Referencias locales configuradas para 'git push'%s:"
+
+#: builtin/remote.c:1230
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
+
+#: builtin/remote.c:1232
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "borrar refs/remotos/<nombre>/HEAD"
+
+#: builtin/remote.c:1247
+msgid "Cannot determine remote HEAD"
+msgstr "No se puede determinar el HEAD remoto"
+
+#: builtin/remote.c:1249
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
+
+#: builtin/remote.c:1259
+#, c-format
+msgid "Could not delete %s"
+msgstr "No se pudo borrar %s"
+
+#: builtin/remote.c:1267
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "No es un ref válido: %s"
+
+#: builtin/remote.c:1269
+#, c-format
+msgid "Could not setup %s"
+msgstr "No se pudo configurar %s"
+
+#: builtin/remote.c:1287
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s será colgado!"
+
+#: builtin/remote.c:1288
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s ha sido colgado!"
+
+#: builtin/remote.c:1298
+#, c-format
+msgid "Pruning %s"
+msgstr "Recortando %s"
+
+#: builtin/remote.c:1299
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1315
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [ejecutará prune] %s"
+
+#: builtin/remote.c:1318
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [prune realizado] %s"
+
+#: builtin/remote.c:1363
+msgid "prune remotes after fetching"
+msgstr "recortar remotos tras realizar fetch"
+
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#, c-format
+msgid "No such remote '%s'"
+msgstr "No existe el remoto '%s'"
+
+#: builtin/remote.c:1442
+msgid "add branch"
+msgstr "agregar rama"
+
+#: builtin/remote.c:1449
+msgid "no remote specified"
+msgstr "no hay remotos especificados"
+
+#: builtin/remote.c:1466
+msgid "query push URLs rather than fetch URLs"
+msgstr "consultar URLs de push en lugar de URLs de fetch"
+
+#: builtin/remote.c:1468
+msgid "return all URLs"
+msgstr "retornar todos los URLs"
+
+#: builtin/remote.c:1496
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "no hay URLs configurados para remoto '%s'"
+
+#: builtin/remote.c:1522
+msgid "manipulate push URLs"
+msgstr "manipular URLs de push"
+
+#: builtin/remote.c:1524
+msgid "add URL"
+msgstr "agregar URL"
+
+#: builtin/remote.c:1526
+msgid "delete URLs"
+msgstr "borrar URLs"
+
+#: builtin/remote.c:1533
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete no tiene sentido"
+
+#: builtin/remote.c:1572
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Patrón de URL viejo inválido: %s"
+
+#: builtin/remote.c:1580
+#, c-format
+msgid "No such URL found: %s"
+msgstr "No se encontró URL: %s"
+
+#: builtin/remote.c:1582
+msgid "Will not delete all non-push URLs"
+msgstr "No borrará todos los URLs de no-push"
+
+#: builtin/remote.c:1598
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+
+#: builtin/remote.c:1629
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sub-comando desconocido: %s"
+
+#: builtin/repack.c:18
+msgid "git repack [<options>]"
+msgstr "git repack [<opciones>]"
+
+#: builtin/repack.c:23
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+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
+msgid "pack everything in a single pack"
+msgstr "empaquetar todo en un único paquete"
+
+#: builtin/repack.c:170
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "lo mismo que -a, y pierde objetos inaccesibles"
+
+#: builtin/repack.c:173
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "remover paquetes redundantes, y ejecutar git-prune-packed"
+
+#: builtin/repack.c:175
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "pasar --no-reuse-delta a git-pack-objects"
+
+#: builtin/repack.c:177
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "pasar --no-reuse-object a git-pack-objects"
+
+#: builtin/repack.c:179
+msgid "do not run git-update-server-info"
+msgstr "no ejecutar git-update-server-info"
+
+#: builtin/repack.c:182
+msgid "pass --local to git-pack-objects"
+msgstr "pasar --local a git-pack-objects"
+
+#: builtin/repack.c:184
+msgid "write bitmap index"
+msgstr "escribir un índice de bitmap"
+
+#: builtin/repack.c:185
+msgid "approxidate"
+msgstr "aproxime"
+
+#: builtin/repack.c:186
+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
+msgid "with -a, repack unreachable objects"
+msgstr "con -a, re empaquetar objetos inalcanzables "
+
+#: builtin/repack.c:190
+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
+msgid "bytes"
+msgstr "bytes"
+
+#: builtin/repack.c:192
+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
+msgid "limits the maximum delta depth"
+msgstr "limita la profundidad máxima del delta"
+
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "limita el número máximo de hilos"
+
+#: builtin/repack.c:198
+msgid "maximum size of each packfile"
+msgstr "tamaño máximo de cada paquete"
+
+#: builtin/repack.c:200
+msgid "repack objects in packs marked with .keep"
+msgstr "re-empaquetar objetos en paquetes marcados con .keep"
+
+#: builtin/repack.c:210
+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
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable y -A son incompatibles"
+
+#: builtin/repack.c:406 builtin/worktree.c:134
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "falló al remover '%s'"
+
+#: builtin/replace.c:20
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <objeto> <remplazo>"
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <objeto>"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <commit> [<padre>...]"
+
+#: builtin/replace.c:23
+msgid "git replace -d <object>..."
+msgstr "git replace -d <objeto>..."
+
+#: builtin/replace.c:24
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
+
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr "Nombre de objeto no válido: '%s'"
+
+#: builtin/replace.c:361
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "mal mergetag en commit '%s'"
+
+#: builtin/replace.c:363
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "mergetag mal formado en commit '%s'"
+
+#: builtin/replace.c:374
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
+"en lugar de --graft"
+
+#: builtin/replace.c:407
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "el commit original '%s' tiene una firma gpg."
+
+#: builtin/replace.c:408
+msgid "the signature will be removed in the replacement commit!"
+msgstr "la firma será removida en el commit de reemplazo!"
+
+#: builtin/replace.c:414
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "no se pudo escribir el commit de reemplazo: '%s'"
+
+#: builtin/replace.c:438
+msgid "list replace refs"
+msgstr "listar replace refs "
+
+#: builtin/replace.c:439
+msgid "delete replace refs"
+msgstr "borrar replace refs"
+
+#: builtin/replace.c:440
+msgid "edit existing object"
+msgstr "editar objeto existente"
+
+#: builtin/replace.c:441
+msgid "change a commit's parents"
+msgstr "cambiar un padre de commit"
+
+#: builtin/replace.c:442
+msgid "replace the ref if it exists"
+msgstr "reemplazar el ref si este existe"
+
+#: builtin/replace.c:443
+msgid "do not pretty-print contents for --edit"
+msgstr "no se puede imprimir contenidos para --edit"
+
+#: builtin/replace.c:444
+msgid "use this format"
+msgstr "usar este formato"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:59
+msgid "register clean resolutions in index"
+msgstr "registrar resoluciones limpias en el índice"
+
+#: builtin/reset.c:29
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+
+#: builtin/reset.c:30
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<arbol-ismo>] [--] <rutas>..."
+
+#: builtin/reset.c:31
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<arbol-ismo>] [--] [<rutas>...]"
+
+#: builtin/reset.c:37
+msgid "mixed"
+msgstr "mezclado"
+
+#: builtin/reset.c:37
+msgid "soft"
+msgstr "suave"
+
+#: builtin/reset.c:37
+msgid "hard"
+msgstr "duro"
+
+#: builtin/reset.c:37
+msgid "merge"
+msgstr "fusionar"
+
+#: builtin/reset.c:37
+msgid "keep"
+msgstr "mantener"
+
+#: builtin/reset.c:78
+msgid "You do not have a valid HEAD."
+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"
+
+#: builtin/reset.c:86
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Falló al encontrar árbol de %s."
+
+#: builtin/reset.c:113
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD está ahora en %s"
+
+#: builtin/reset.c:197
+#, 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."
+
+#: builtin/reset.c:297
+msgid "be quiet, only report errors"
+msgstr "ser silencioso, solo reportar errores"
+
+#: builtin/reset.c:299
+msgid "reset HEAD and index"
+msgstr "reiniciar HEAD e index"
+
+#: builtin/reset.c:300
+msgid "reset only HEAD"
+msgstr "reiniciar solo HEAD"
+
+#: builtin/reset.c:302 builtin/reset.c:304
+msgid "reset HEAD, index and working tree"
+msgstr "reiniciar HEAD, índice y árbol de trabajo"
+
+#: builtin/reset.c:306
+msgid "reset HEAD but keep local changes"
+msgstr "reiniciar HEAD pero mantener cambios locales"
+
+#: builtin/reset.c:312
+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
+#, 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
+#, 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
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch es incompatible con --{hard,mixed,soft}"
+
+#: builtin/reset.c:355
+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
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "No se puede hacer un reset %s con rutas."
+
+#: builtin/reset.c:367
+#, 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
+msgid "-N can only be used with --mixed"
+msgstr "-N sólo puede ser usada con --mixed"
+
+#: builtin/reset.c:388
+msgid "Unstaged changes after reset:"
+msgstr "Cambios fuera del área de stage tras el reset:"
+
+#: builtin/reset.c:394
+#, 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
+msgid "Could not write new index file."
+msgstr "No se puede escribir un nuevo archivo índice."
+
+#: builtin/rev-list.c:361
+msgid "rev-list does not support display of notes"
+msgstr "rev-list no soporta mostrar notas"
+
+#: builtin/rev-parse.c:402
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
+
+#: builtin/rev-parse.c:407
+msgid "keep the `--` passed as an arg"
+msgstr "mantener el `--` pasado como un arg"
+
+#: builtin/rev-parse.c:409
+msgid "stop parsing after the first non-option argument"
+msgstr "detener análisis tras el primer argumento que no es opción"
+
+#: builtin/rev-parse.c:412
+msgid "output in stuck long form"
+msgstr "salida en formulario largo de atasco"
+
+#: builtin/rev-parse.c:545
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<opciones>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<opciones>] [<arg>...]\n"
+"\n"
+"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
+"uso."
+
+#: builtin/revert.c:23
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<opciones>] <commit-ish>..."
+
+#: builtin/revert.c:24
+msgid "git revert <subcommand>"
+msgstr "git revert <subcomando>"
+
+#: builtin/revert.c:29
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opciones>] <commit-ish>..."
+
+#: builtin/revert.c:30
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <subcomando>"
+
+#: builtin/revert.c:90
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s no puede ser usado con %s"
+
+#: builtin/revert.c:99
+msgid "end revert or cherry-pick sequence"
+msgstr "finalizar secuencia revert o cherry-pick"
+
+#: builtin/revert.c:100
+msgid "resume revert or cherry-pick sequence"
+msgstr "resumir secuencia revert o cherry-pick"
+
+#: builtin/revert.c:101
+msgid "cancel revert or cherry-pick sequence"
+msgstr "cancelar secuencia revert o cherry-pick"
+
+#: builtin/revert.c:102
+msgid "don't automatically commit"
+msgstr "no realizar commit de forma automática"
+
+#: builtin/revert.c:103
+msgid "edit the commit message"
+msgstr "editar el mensaje de commit"
+
+#: builtin/revert.c:106
+msgid "parent-number"
+msgstr "número-de-padre"
+
+#: builtin/revert.c:107
+msgid "select mainline parent"
+msgstr "seleccionar el padre principal"
+
+#: builtin/revert.c:109
+msgid "merge strategy"
+msgstr "estrategia de fusión"
+
+#: builtin/revert.c:110
+msgid "option"
+msgstr "opción"
+
+#: builtin/revert.c:111
+msgid "option for merge strategy"
+msgstr "opción para estrategia de fusión"
+
+#: builtin/revert.c:120
+msgid "append commit name"
+msgstr "adjuntar el nombre del commit"
+
+#: builtin/revert.c:122
+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"
+
+#: builtin/revert.c:214
+msgid "revert failed"
+msgstr "falló al revertir"
+
+#: builtin/revert.c:227
+msgid "cherry-pick failed"
+msgstr "cherry-pick falló"
+
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opciones>] [--] <archivo>..."
+
+#: builtin/rm.c:206
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+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"
+"y a HEAD:"
+msgstr[1] ""
+"los siguientes archivos tienen contenido diferente a los mismos\n"
+"y a HEAD:"
+
+#: builtin/rm.c:211
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(usa -f para forzar su eliminación)"
+
+#: builtin/rm.c:215
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:"
+msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
+
+#: builtin/rm.c:219 builtin/rm.c:228
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
+
+#: builtin/rm.c:225
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "el siguiente archivo tiene modificaciones locales:"
+msgstr[1] "los siguientes archivos tienen modificaciones locales:"
+
+#: builtin/rm.c:243
+msgid "do not list removed files"
+msgstr "no listar archivos removidos"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "solo remover del índice"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "sobrescribir el check de actualizado"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "permitir remover de forma recursiva"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "salir con stado cero incluso si nada concuerda"
+
+#: builtin/rm.c:307
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "no removiendo '%s' de manera recursiva sin -r"
+
+#: builtin/rm.c:346
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: no es posible remover %s"
+
+#: builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no se pudo remover '%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"
+"  --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+"  --all y especificaciones <ref> explícitas son mutuamente exclusivas."
+
+#: builtin/send-pack.c:162
+msgid "remote name"
+msgstr "nombre remoto"
+
+#: builtin/send-pack.c:176
+msgid "use stateless RPC protocol"
+msgstr "usar protocolo RPC sin estado"
+
+#: builtin/send-pack.c:177
+msgid "read refs from stdin"
+msgstr "leer refs de stdin"
+
+#: builtin/send-pack.c:178
+msgid "print status from remote helper"
+msgstr "mostrar status del remote helper"
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]"
+
+#: builtin/shortlog.c:263
+msgid "Group by committer rather than author"
+msgstr "Agrupar por committer en lugar de autor"
+
+#: builtin/shortlog.c:265
+msgid "sort output according to the number of commits per author"
+msgstr "ordenar salida de acuerdo al número de commits por autor"
+
+#: builtin/shortlog.c:267
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
+
+#: builtin/shortlog.c:269
+msgid "Show the email address of each author"
+msgstr "Mostrar la dirección de correo de cada autor"
+
+#: builtin/shortlog.c:270
+msgid "w[,i1[,i2]]"
+msgstr "w[,i1[,i2]]"
+
+#: builtin/shortlog.c:271
+msgid "Linewrap output"
+msgstr "Salida de línea"
+
+#: builtin/show-branch.c:12
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+
+#: builtin/show-branch.c:16
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+
+#: builtin/show-branch.c:376
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
+msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
+
+#: builtin/show-branch.c:530
+#, c-format
+msgid "no matching refs with %s"
+msgstr "no hay refs que concuerden con %s"
+
+#: builtin/show-branch.c:626
+msgid "show remote-tracking and local branches"
+msgstr "mostrar ramas locales y de rastreo remoto"
+
+#: builtin/show-branch.c:628
+msgid "show remote-tracking branches"
+msgstr "mostrar ramas de rastreo remoto"
+
+#: builtin/show-branch.c:630
+msgid "color '*!+-' corresponding to the branch"
+msgstr "color '*!+-' correspondiendo a la rama"
+
+#: builtin/show-branch.c:632
+msgid "show <n> more commits after the common ancestor"
+msgstr "mostrar <n> commits más tras encontrar el ancestro común"
+
+#: builtin/show-branch.c:634
+msgid "synonym to more=-1"
+msgstr "sinonimo de más=-1"
+
+#: builtin/show-branch.c:635
+msgid "suppress naming strings"
+msgstr "suprimir strings de nombre"
+
+#: builtin/show-branch.c:637
+msgid "include the current branch"
+msgstr "incluir la rama actual"
+
+#: builtin/show-branch.c:639
+msgid "name commits with their object names"
+msgstr "nombrar commits con sus nombres de objeto"
+
+#: builtin/show-branch.c:641
+msgid "show possible merge bases"
+msgstr "mostrar bases de fusión posibles"
+
+#: builtin/show-branch.c:643
+msgid "show refs unreachable from any other ref"
+msgstr "mostrar refs inalcanzables por ningún otro ref"
+
+#: builtin/show-branch.c:645
+msgid "show commits in topological order"
+msgstr "mostrar commits en orden topológico"
+
+#: builtin/show-branch.c:648
+msgid "show only commits not on the first branch"
+msgstr "mostrar solo commits que no están en la primera rama"
+
+#: builtin/show-branch.c:650
+msgid "show merges reachable from only one tip"
+msgstr "mostrar fusiones alcanzables solo por una punta"
+
+#: builtin/show-branch.c:652
+msgid "topologically sort, maintaining date order where possible"
+msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
+
+#: builtin/show-branch.c:655
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:656
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
+
+#: builtin/show-branch.c:690
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
+
+#: builtin/show-branch.c:714
+msgid "no branches given, and HEAD is not valid"
+msgstr "no se dieron ramas, y el HEAD no es válido"
+
+#: builtin/show-branch.c:717
+msgid "--reflog option needs one branch name"
+msgstr "opción --reflog necesita un nombre de rama"
+
+#: builtin/show-branch.c:720
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] "solo %d entrada puede ser mostrada a la vez."
+msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
+
+#: builtin/show-branch.c:724
+#, c-format
+msgid "no such ref %s"
+msgstr "no existe el ref %s"
+
+#: builtin/show-branch.c:808
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "no se puede manejar más de %d rev."
+msgstr[1] "no se puede manejar más de %d revs."
+
+#: builtin/show-branch.c:812
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' no es una ref válida."
+
+#: builtin/show-branch.c:815
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "no se puede encontrar el commit %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>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
+
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<patrón>]"
+
+#: builtin/show-ref.c:159
+msgid "only show tags (can be combined with heads)"
+msgstr "solo mostrar tags (puede ser combinado con heads)"
+
+#: builtin/show-ref.c:160
+msgid "only show heads (can be combined with tags)"
+msgstr "solo mostrar heads (puede ser combinado con tags)"
+
+#: builtin/show-ref.c:161
+msgid "stricter reference checking, requires exact ref path"
+msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
+
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
+
+#: builtin/show-ref.c:168
+msgid "dereference tags into object IDs"
+msgstr "tags de deferencia en IDs de objeto"
+
+#: builtin/show-ref.c:170
+msgid "only show SHA1 hash using <n> digits"
+msgstr "solo mostrar hash SHA1 usando <n> dígitos"
+
+#: builtin/show-ref.c:174
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "no mostrar resultados en stdout (útil con --verify)"
+
+#: builtin/show-ref.c:176
+msgid "show refs from stdin that aren't in local repository"
+msgstr "mostrar refs de stdin que no están en el repositorio local"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:36
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"saltar y borrar todas las líneas que comienzan con un caracter de comentario"
+
+#: builtin/stripspace.c:39
+msgid "prepend comment character and space to each line"
+msgstr "anteponer caracter de comentario y espacio a cada línea"
+
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
+#, c-format
+msgid "No such ref: %s"
+msgstr "No existe ref: %s"
+
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
+#, 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:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "no se puede quitar un componente del url '%s'"
+
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
+msgid "alternative anchor for relative paths"
+msgstr "ancho alternativo para rutas relativas"
+
+#: builtin/submodule--helper.c:307
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
+
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
+#, 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:389
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
+"su propio upstream autoritativo."
+
+#: builtin/submodule--helper.c:400
+#, 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:404
+#, 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:414
+#, 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:421
+#, 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:437
+msgid "Suppress output for initializing a submodule"
+msgstr "suprime la salida para inicializar un submódulo"
+
+#: builtin/submodule--helper.c:442
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<ruta>]"
+
+#: builtin/submodule--helper.c:470
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <ruta>"
+
+#: builtin/submodule--helper.c:475
+#, 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'"
+
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "submódulo '%s' no puede agregar alterno: %s"
+
+#: builtin/submodule--helper.c:597
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
+
+#: builtin/submodule--helper.c:604
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
+
+#: builtin/submodule--helper.c:626
+msgid "where the new submodule will be cloned to"
+msgstr "a donde el nuevo submódulo será clonado"
+
+#: builtin/submodule--helper.c:629
+msgid "name of the new submodule"
+msgstr "nombre del nuevo submódulo"
+
+#: builtin/submodule--helper.c:632
+msgid "url where to clone the submodule from"
+msgstr "url de dónde clonar el submódulo"
+
+#: builtin/submodule--helper.c:638
+msgid "depth for shallow clones"
+msgstr "profundidad para clones superficiales"
+
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
+msgid "force cloning progress"
+msgstr "forzar el proceso de clonado"
+
+#: builtin/submodule--helper.c:646
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
+"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
+"<ruta>"
+
+#: builtin/submodule--helper.c:677
+#, 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:692
+#, 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:757
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Ruta de submódulo '%s' no inicializada"
+
+#: builtin/submodule--helper.c:761
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Tal vez quiere usar 'update --init'?"
+
+#: builtin/submodule--helper.c:790
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Saltando submódulo %s no fusionado"
+
+#: builtin/submodule--helper.c:819
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Saltando submódulo '%s'"
+
+#: builtin/submodule--helper.c:952
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Falló al clonar '%s'. Reintento programado"
+
+#: builtin/submodule--helper.c:963
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Falló al clonar '%s' una segunda vez, abortando"
+
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
+msgid "path into the working tree"
+msgstr "ruta hacia el árbol de trabajo"
+
+#: builtin/submodule--helper.c:996
+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:1000
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout o none"
+
+#: builtin/submodule--helper.c:1004
+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:1007
+msgid "parallel jobs"
+msgstr "trabajos paralelos"
+
+#: builtin/submodule--helper.c:1009
+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:1010
+msgid "don't print cloning progress"
+msgstr "no mostrar el progreso de clonado"
+
+#: builtin/submodule--helper.c:1017
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
+
+#: builtin/submodule--helper.c:1030
+msgid "bad value for update parameter"
+msgstr "mal valor para parámetro update"
+
+#: builtin/submodule--helper.c:1098
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Rama de submódulo (%s)  configurada para heredar rama del superproyecto, "
+"pero el superproyecto no está en ninguna rama"
+
+#: builtin/submodule--helper.c:1214
+msgid "recurse into submodules"
+msgstr "recurrir a submódulos"
+
+#: builtin/submodule--helper.c:1220
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr "git submodule--helper embed-git-dir [<ruta>...]"
+
+#: builtin/submodule--helper.c:1278
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s no soporta --super-prefix"
+
+#: builtin/submodule--helper.c:1284
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' no es un comando submodule--helper valido"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <nombre>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "eliminar referencia simbólica"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "salida de referencia más corta"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
+msgstr "razón"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
+msgstr "razón de la actualización"
+
+#: builtin/tag.c:24
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
+"<nombre-de-etiqueta> [<head>]"
+
+#: builtin/tag.c:25
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nombre-de-etiqueta>..."
+
+#: builtin/tag.c:26
+msgid ""
+"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[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objeto>]\n"
+"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
+
+#: builtin/tag.c:28
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
+
+#: builtin/tag.c:86
+#, c-format
+msgid "tag '%s' not found."
+msgstr "etiqueta '%s' no encontrada."
+
+#: builtin/tag.c:102
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Etiqueta '%s' eliminada (era %s)\n"
+
+#: builtin/tag.c:131
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Escribe un mensaje para la etiqueta:\n"
+"  %s\n"
+"Las líneas que comienzan con '%c' serán ignoradas.\n"
+
+#: builtin/tag.c:135
+#, c-format
+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"
+msgstr ""
+"\n"
+"Escribe un mensaje para la etiqueta:\n"
+"  %s\n"
+"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
+"ti mismo si quieres hacerlo.\n"
+
+#: builtin/tag.c:189
+msgid "unable to sign the tag"
+msgstr "incapaz de firmar etiqueta"
+
+#: builtin/tag.c:191
+msgid "unable to write tag file"
+msgstr "incapaz de escribir el archivo de etiqueta"
+
+#: builtin/tag.c:215
+msgid "bad object type."
+msgstr "tipo de objeto erróneo."
+
+#: builtin/tag.c:261
+msgid "no tag message?"
+msgstr "¿Sin mensaje de etiqueta?"
+
+#: builtin/tag.c:268
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "El mensaje de la etiqueta ha sido dejado en %s\n"
+
+#: builtin/tag.c:376
+msgid "list tag names"
+msgstr "listar nombres de etiquetas"
+
+#: builtin/tag.c:378
+msgid "print <n> lines of each tag message"
+msgstr "imprimir <n> líneas de cada mensaje de etiqueta"
+
+#: builtin/tag.c:380
+msgid "delete tags"
+msgstr "eliminar etiquetas"
+
+#: builtin/tag.c:381
+msgid "verify tags"
+msgstr "verificar etiquetas"
+
+#: builtin/tag.c:383
+msgid "Tag creation options"
+msgstr "Opciones de creación de etiquetas"
+
+#: builtin/tag.c:385
+msgid "annotated tag, needs a message"
+msgstr "etiquetas anotadas necesitan un mensaje"
+
+#: builtin/tag.c:387
+msgid "tag message"
+msgstr "mensaje de etiqueta"
+
+#: builtin/tag.c:389
+msgid "annotated and GPG-signed tag"
+msgstr "etiqueta anotada y firmada con GPG"
+
+#: builtin/tag.c:393
+msgid "use another key to sign the tag"
+msgstr "usar otra clave para firmar la etiqueta"
+
+#: builtin/tag.c:394
+msgid "replace the tag if exists"
+msgstr "remplazar etiqueta si existe"
+
+#: builtin/tag.c:395 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "crear un reflog"
+
+#: builtin/tag.c:397
+msgid "Tag listing options"
+msgstr "Opciones de listado de etiqueta"
+
+#: builtin/tag.c:398
+msgid "show tag list in columns"
+msgstr "mostrar lista de etiquetas en columnas"
+
+#: builtin/tag.c:399 builtin/tag.c:401
+msgid "print only tags that contain the commit"
+msgstr "mostrar solo tags que contienen el commit"
+
+#: builtin/tag.c:400 builtin/tag.c:402
+msgid "print only tags that don't contain the commit"
+msgstr "mostrar solo tags que no contienen el commit"
+
+#: builtin/tag.c:403
+msgid "print only tags that are merged"
+msgstr "sólo imprimir las etiquetas que están fusionadas"
+
+#: builtin/tag.c:404
+msgid "print only tags that are not merged"
+msgstr "sólo imprimir las etiquetas que no están fusionadas"
+
+#: builtin/tag.c:409
+msgid "print only tags of the object"
+msgstr "sólo imprimir etiquetas de el objeto"
+
+#: builtin/tag.c:453
+msgid "--column and -n are incompatible"
+msgstr "--column y -n son incompatibles"
+
+#: builtin/tag.c:475
+msgid "-n option is only allowed in list mode"
+msgstr "opción -n solo es permitida en modo lista"
+
+#: builtin/tag.c:477
+msgid "--contains option is only allowed in list mode"
+msgstr "opción --contains solo es permitido en modo lista"
+
+#: builtin/tag.c:479
+msgid "--no-contains option is only allowed in list mode"
+msgstr "opción --no-contains solo es permitida en moso lista"
+
+#: builtin/tag.c:481
+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
+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
+msgid "only one -F or -m option is allowed."
+msgstr "sólo se permite una de las opciones, -m ó -F."
+
+#: builtin/tag.c:513
+msgid "too many params"
+msgstr "demasiados parámetros"
+
+#: builtin/tag.c:519
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' no es un nombre de etiqueta válido."
+
+#: builtin/tag.c:524
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "la etiqueta '%s' ya existe"
+
+#: builtin/tag.c:554
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Etiqueta '%s' actualizada (era %s)\n"
+
+#: builtin/unpack-objects.c:494
+msgid "Unpacking objects"
+msgstr "Desempaquetando objetos"
+
+#: builtin/update-index.c:80
+#, c-format
+msgid "failed to create directory %s"
+msgstr "fallo al crear directorio %s"
+
+#: builtin/update-index.c:86
+#, c-format
+msgid "failed to stat %s"
+msgstr "fallo al iniciar %s"
+
+#: builtin/update-index.c:96
+#, c-format
+msgid "failed to create file %s"
+msgstr "fallo al crear el archivo %s"
+
+#: builtin/update-index.c:104
+#, c-format
+msgid "failed to delete file %s"
+msgstr "fallo al eliminar el archivo %s"
+
+#: builtin/update-index.c:111 builtin/update-index.c:217
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "fallo al eliminar directorio %s"
+
+#: builtin/update-index.c:136
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Probando mtime en '%s' "
+
+#: builtin/update-index.c:150
+msgid "directory stat info does not change after adding a new file"
+msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
+
+#: builtin/update-index.c:163
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+"info de estado del directorio no cambia tras agregar un nuevo directorio"
+
+#: builtin/update-index.c:176
+msgid "directory stat info changes after updating a file"
+msgstr "info de estado del directorio cambia tras actualizar un archivo"
+
+#: builtin/update-index.c:187
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+"info de estado del directorio cambia tras agregar un archivo dentro del "
+"subdirectorio"
+
+#: builtin/update-index.c:198
+msgid "directory stat info does not change after deleting a file"
+msgstr "info de estado del directorio no cambia tras borrar un archivo"
+
+#: builtin/update-index.c:211
+msgid "directory stat info does not change after deleting a directory"
+msgstr "info de estado del directorio no cambia tras borrar un directorio"
+
+#: builtin/update-index.c:218
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:571
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opciones>] [--] [<archivo>...]"
+
+#: builtin/update-index.c:926
+msgid "continue refresh even when index needs update"
+msgstr "continuar refresh incluso cuando el índice necesita actualizar"
+
+#: builtin/update-index.c:929
+msgid "refresh: ignore submodules"
+msgstr "refresh: ignora submódulos"
+
+#: builtin/update-index.c:932
+msgid "do not ignore new files"
+msgstr "no ignorar archivos nuevos"
+
+#: builtin/update-index.c:934
+msgid "let files replace directories and vice-versa"
+msgstr "permitir que archivos remplacen directorios y vice-versa"
+
+#: builtin/update-index.c:936
+msgid "notice files missing from worktree"
+msgstr "avisar de archivos faltando en el árbol de trabajo"
+
+#: builtin/update-index.c:938
+msgid "refresh even if index contains unmerged entries"
+msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
+
+#: builtin/update-index.c:941
+msgid "refresh stat information"
+msgstr "refresh información de estado"
+
+#: builtin/update-index.c:945
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "como --refresh, pero ignora configuración assume-unchanged"
+
+#: builtin/update-index.c:949
+msgid "<mode>,<object>,<path>"
+msgstr "<modo>,<objeto>,<ruta>"
+
+#: builtin/update-index.c:950
+msgid "add the specified entry to the index"
+msgstr "agregar la entrada especificada al índice"
+
+#: builtin/update-index.c:959
+msgid "mark files as \"not changing\""
+msgstr "marcar archivos como \"not changing\""
+
+#: builtin/update-index.c:962
+msgid "clear assumed-unchanged bit"
+msgstr "limpiar bit assumed-unchanged"
+
+#: builtin/update-index.c:965
+msgid "mark files as \"index-only\""
+msgstr "marcar archivos como \"index-only\""
+
+#: builtin/update-index.c:968
+msgid "clear skip-worktree bit"
+msgstr "limpiar bit skip-worktree"
+
+#: builtin/update-index.c:971
+msgid "add to index only; do not add content to object database"
+msgstr ""
+"agregar solo al índice; no agregar contenido a la base de datos de objetos"
+
+#: builtin/update-index.c:973
+msgid "remove named paths even if present in worktree"
+msgstr ""
+"remover rutas nombradas incluso si están presentes en el árbol de trabajo"
+
+#: builtin/update-index.c:975
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "con --stdin: línas de entrada son terminadas con bytes null"
+
+#: builtin/update-index.c:977
+msgid "read list of paths to be updated from standard input"
+msgstr "leer la lista de rutas para ser actualizada desde standard input"
+
+#: builtin/update-index.c:981
+msgid "add entries from standard input to the index"
+msgstr "agregar entradas de standard input al índice"
+
+#: builtin/update-index.c:985
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "repoblar stages #2 y #3 para las rutas listadas"
+
+#: builtin/update-index.c:989
+msgid "only update entries that differ from HEAD"
+msgstr "solo actualizar entradas que difieren de HEAD"
+
+#: builtin/update-index.c:993
+msgid "ignore files missing from worktree"
+msgstr "ignorar archivos faltantes en el árbol de trabajo"
+
+#: builtin/update-index.c:996
+msgid "report actions to standard output"
+msgstr "reportar acciones por standard output"
+
+#: builtin/update-index.c:998
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
+
+#: builtin/update-index.c:1002
+msgid "write index in this format"
+msgstr "escribir índice en este formato"
+
+#: builtin/update-index.c:1004
+msgid "enable or disable split index"
+msgstr "activar o desactivar índice dividido"
+
+#: builtin/update-index.c:1006
+msgid "enable/disable untracked cache"
+msgstr "habilitar o deshabilitar caché no rastreado"
+
+#: builtin/update-index.c:1008
+msgid "test if the filesystem supports untracked cache"
+msgstr "probar si el filesystem soporta caché no rastreado"
+
+#: builtin/update-index.c:1010
+msgid "enable untracked cache without testing the filesystem"
+msgstr "habilitar caché no rastreado sin probar el filesystem"
+
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el índice partido"
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
+"quieres deshabilitar el índice partido"
+
+#: builtin/update-index.c:1127
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
+"realmente quieres deshabilitar el chaché no rastreado"
+
+#: builtin/update-index.c:1131
+msgid "Untracked cache disabled"
+msgstr "Caché no rastreado deshabilitado"
+
+#: builtin/update-index.c:1139
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el caché no rastreado"
+
+#: builtin/update-index.c:1143
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Caché no rastreado habilitado para '%s'"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-"
+"anterior>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<opciones>] --stdin [-z]"
+
+#: builtin/update-ref.c:363
+msgid "delete the reference"
+msgstr "eliminar la referencia"
+
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
+msgstr "actualiza <refname> no a lo que apunta"
+
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin tiene argumentos terminados en NUL"
+
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
+msgstr "lee actualizaciones de stdin"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "actualiza el archivo info desde cero"
+
+#: builtin/verify-commit.c:18
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <confirmación>..."
+
+#: builtin/verify-commit.c:73
+msgid "print commit contents"
+msgstr "imprimir contenido de la confirmación"
+
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
+msgstr "muestra la salida de status gpg en formato raw"
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..."
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr "verboso"
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr "solo mostrar estadísticas"
+
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
+msgstr "imprimir contenido de la etiqueta"
+
+#: builtin/worktree.c:16
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<opciones>] <ruta> [<rama>]"
+
+#: builtin/worktree.c:17
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opciones>]"
+
+#: builtin/worktree.c:18
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opciones>] <ruta>"
+
+#: builtin/worktree.c:19
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opciones>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <ruta>"
+
+#: builtin/worktree.c:46
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "Removiendo el worktrees/%s: no es un directorio válido"
+
+#: builtin/worktree.c:52
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
+
+#: builtin/worktree.c:57 builtin/worktree.c:66
+#, 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:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
+"bytes, %<PRIuMAX> leídos)"
+
+#: builtin/worktree.c:84
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+
+#: builtin/worktree.c:100
+#, 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:147
+msgid "report pruned working trees"
+msgstr "reporta árboles de trabajo recortados"
+
+#: builtin/worktree.c:149
+msgid "expire working trees older than <time>"
+msgstr "expirar árboles de trabajo más viejos a <tiempo>"
+
+#: builtin/worktree.c:223
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' ya existe"
+
+#: builtin/worktree.c:254
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "no se pudo crear directorio de '%s'"
+
+#: builtin/worktree.c:293
+#, c-format
+msgid "Preparing %s (identifier %s)"
+msgstr "Preparando %s (identificador %s)"
+
+#: builtin/worktree.c:345
+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:347
+msgid "create a new branch"
+msgstr "crear una nueva rama"
+
+#: builtin/worktree.c:349
+msgid "create or reset a branch"
+msgstr "crear o restablecer una rama"
+
+#: builtin/worktree.c:351
+msgid "populate the new working tree"
+msgstr "popular el nuevo árbol de trabajo"
+
+#: builtin/worktree.c:352
+msgid "keep the new working tree locked"
+msgstr "mantener el nuevo árbol de trabajo bloqueado"
+
+#: builtin/worktree.c:360
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B, y --detach son mutuamente exclusivas"
+
+#: builtin/worktree.c:499
+msgid "reason for locking"
+msgstr "razón para bloquear"
+
+#: builtin/worktree.c:511 builtin/worktree.c:544
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' no es un árbol de trabajo"
+
+#: builtin/worktree.c:513 builtin/worktree.c:546
+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:518
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' ya está bloqueado; razón: %s"
+
+#: builtin/worktree.c:520
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' ya está bloqueado"
+
+#: builtin/worktree.c:548
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' no está bloqueado"
+
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
+
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
+msgstr "<prefijo>/"
+
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "escribit objeto árbol para un subdirectorio <prefijo>"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "sólo útil para depurar"
+
+#: upload-pack.c:23
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opciones>] <directorio>"
+
+#: upload-pack.c:1040
+msgid "quit after a single request/response exchange"
+msgstr "sale después de un intercambio petición/respuesta único"
+
+#: upload-pack.c:1042
+msgid "exit immediately after initial ref advertisement"
+msgstr "salir inmediatamente tras el anuncio inicial de ref"
+
+#: upload-pack.c:1044
+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:1046
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interrumpir transferencia tras <n> segundos de inactividad"
+
+#: credential-cache--daemon.c:222
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Los permisos en su directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considere "
+"ejecutar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
+msgstr "mostrar mensajes de debug en stderr"
+
+#: git.c:15
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
+"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
+"para leer sobre un subcomando o concepto específico."
+
+#: http.c:338
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
+
+#: http.c:359
+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:368
+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:1768
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"no puede actualizar la base de url de la redirección:\n"
+"  preguntaba por: %s\n"
+"   redireccionamiento: %s"
+
+#: remote-curl.c:324
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirigiendo a %s"
+
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comienza un area de trabajo (mira tambien: git help tutorial)"
+
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabaja en los cambios actuales (mira tambien: git help everyday)"
+
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examina el historial y el estado (mira tambien: git help revisions)"
+
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
+msgstr "crece, marca y ajusta tu historial comun"
+
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
+msgstr "colabora (mira tambien: git help workflows)"
+
+#: common-cmds.h:17
+msgid "Add file contents to the index"
+msgstr "Agrega contenido de carpetas al indice"
+
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "usa busqueqda binaria para encontrar el commit que introdujo el bug"
+
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
+msgstr "Lista, crea, o borra ramas"
+
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
+msgstr "Cambia ramas o restaura los archivos de tu arbol de trabajo"
+
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
+msgstr "Clona un repositorio dentro de un nuevo directorio"
+
+#: common-cmds.h:22
+msgid "Record changes to the repository"
+msgstr "Graba los cambios en tu repositorio"
+
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Muestra los cambios entre commits, commit y arbol de trabajo, etc"
+
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
+msgstr "Descarga objetos y referencias de otro repositorio"
+
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
+msgstr "Imprime las lineas que concuerdan con el patron"
+
+#: common-cmds.h:26
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Crea un repositorio de Git vacio o reinicia el que ya existe"
+
+#: common-cmds.h:27
+msgid "Show commit logs"
+msgstr "Muestra los logs de commits"
+
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
+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 vinculos simbolicos"
+
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Realiza un fetch e integra con otro repositorio o rama local"
+
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
+msgstr "Actualiza referencias remotas junto con sus objetos asociados"
+
+#: common-cmds.h:32
+msgid "Reapply commits on top of another base tip"
+msgstr "Vuelve a aplicar commits en la punta de otra rama"
+
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
+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 arblo de trabajo y del indice"
+
+#: common-cmds.h:35
+msgid "Show various types of objects"
+msgstr "Muestra varios tipos de objetos"
+
+#: common-cmds.h:36
+msgid "Show the working tree status"
+msgstr "Muestra el estado del arblo de trabajo"
+
+#: common-cmds.h:37
+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
+msgid "expiry-date"
+msgstr "fecha de expiracion"
+
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
+msgstr "no-op (compatibilidad con versiones anteriores)"
+
+#: parse-options.h:238
+msgid "be more verbose"
+msgstr "ser mas verboso"
+
+#: parse-options.h:240
+msgid "be more quiet"
+msgstr "ser mas discreto"
+
+#: parse-options.h:246
+msgid "use <n> digits to display SHA-1s"
+msgstr "usa <n> digitos para mostrar SHA-1s"
+
+#: rerere.h:40
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualizar el índice con la resolución de conflictos reutilizada si es "
+"posible"
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "Debes iniciar con \"git bisect start\""
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. 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]?"
+
+#: git-bisect.sh:121
+#, sh-format
+msgid "unrecognised option: '$arg'"
+msgstr "opción no reconocida: '$arg'"
+
+#: git-bisect.sh:125
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
+msgstr "'$arg' no parece ser una revisión válida"
+
+#: git-bisect.sh:154
+msgid "Bad HEAD - I need a HEAD"
+msgstr "Mal HEAD - Necesito un HEAD"
+
+#: git-bisect.sh:167
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr ""
+"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
+
+#: git-bisect.sh:177
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "no se bisectará en un árbol con cg-seek"
+
+#: git-bisect.sh:181
+msgid "Bad HEAD - strange symbolic ref"
+msgstr "Mal HEAD - ref simbólico extraño"
+
+#: git-bisect.sh:233
+#, sh-format
+msgid "Bad bisect_write argument: $state"
+msgstr "Mal argumento bisect_write: $state"
+
+#: git-bisect.sh:262
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "Mala entrada rev: $arg"
+
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Mala entrada rev: $bisected_head"
+
+#: git-bisect.sh:290
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "Mala entrada rev: $rev"
+
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
+
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr "Peligro: bisectando 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:328
+msgid "Are you sure [Y/n]? "
+msgstr "¿Estás seguro [Y/n]?"
+
+#: git-bisect.sh:340
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"Tiene que dar al menos un $bad_syn y un $good_syn revision.\n"
+"(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
+
+#: git-bisect.sh:343
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"Tiene que comenzar por \"git bisect start\".\n"
+"Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n"
+"(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
+
+#: git-bisect.sh:414 git-bisect.sh:546
+msgid "We are not bisecting."
+msgstr "No estamos bisectando."
+
+#: git-bisect.sh:421
+#, sh-format
+msgid "'$invalid' is not a valid commit"
+msgstr "'$invalid' no es una confirmación válida"
+
+#: git-bisect.sh:430
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
+msgstr ""
+"No se pudo revisar el HEAD original '$branch'.\n"
+"Intente 'git bisect reset <commit>'."
+
+#: git-bisect.sh:458
+msgid "No logfile given"
+msgstr "No se entrogó logfile"
+
+#: git-bisect.sh:459
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "no se puede leer $file para reproducir"
+
+#: git-bisect.sh:480
+msgid "?? what are you talking about?"
+msgstr "?? ¿De qué estás hablando?"
+
+#: git-bisect.sh:492
+#, sh-format
+msgid "running $command"
+msgstr "ejecutando $command"
+
+#: git-bisect.sh:499
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"bisect falló:\n"
+"código de salida $res de '$command' es <0 o >=128"
+
+#: git-bisect.sh:525
+msgid "bisect run cannot continue any more"
+msgstr "bisect no puede seguir continuando"
+
+#: git-bisect.sh:531
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"bisect falló:\n"
+"'bisect_state $state' salió con código de error $res"
+
+#: git-bisect.sh:538
+msgid "bisect run success"
+msgstr "bisect exitoso"
+
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "por favor use dos terminos diferentes"
+
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' no es un término válido"
+
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "no se puede usar el comando builtin '$term' como un término"
+
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "no se puede cambiar el significado del término '$term'"
+
+#: git-bisect.sh:606
+#, 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"
+
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "no hay términos definidos"
+
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argumento inválido $arg para 'git bisect terms'.\n"
+"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-"
+"new."
+
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por "
+"la fusión"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+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"
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "No es posible encontrar commit común con $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Ya actualizado con $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Realizando fast-forward a: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Intentando fusión simple con $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Fusión simple no funcionó, intentando fusión automática."
+
+#: git-rebase.sh:58
+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\"."
+msgstr ""
+"Resuelva todos los conflictos manualmente ya sea con \n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"\".\n"
+"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n"
+"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
+"rebase --abort\"."
+
+#: git-rebase.sh:160 git-rebase.sh:402
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "No se puede regresar a $head_name"
+
+#: git-rebase.sh:171
+msgid "Applied autostash."
+msgstr "Autostash aplicado."
+
+#: git-rebase.sh:174
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No se puede almacenar $stash_sha1"
+
+#: git-rebase.sh:214
+msgid "The pre-rebase hook refused to rebase."
+msgstr "El hook pre-rebase rechazó el rebase."
+
+#: git-rebase.sh:219
+msgid "It looks like git-am is in progress. Cannot rebase."
+msgstr "Parece que git-am está en progreso. No se puede hacer rebase."
+
+#: git-rebase.sh:363
+msgid "No rebase in progress?"
+msgstr "No hay rebase en progreso?"
+
+#: git-rebase.sh:374
+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
+msgid "Cannot read HEAD"
+msgstr "No se puede leer el HEAD"
+
+#: git-rebase.sh:384
+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"
+"marcarlos como resueltos usando git add"
+
+#: git-rebase.sh:424
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+"Parece que ya hay un directorio $state_dir_base, y\n"
+"me pregunto si está en medio de otro rebase. Si ese es el \n"
+"caso, por favor intente\n"
+"\t$cmd_live_rebase\n"
+"Si no es el caso, por favor\n"
+"\t$cmd_clear_stale_rebase\n"
+"y ejecúteme nuevamente.  Me estoy deteniendo en caso de que tenga\n"
+"algo de valor ahí."
+
+#: git-rebase.sh:480
+#, sh-format
+msgid "invalid upstream $upstream_name"
+msgstr "upstream inválido $upstream_name"
+
+#: git-rebase.sh:504
+#, 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
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr "$onto_name: no hay base de fusión"
+
+#: git-rebase.sh:516
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr "No apunta a una confirmación válida: $onto_name"
+
+#: git-rebase.sh:539
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
+msgstr "fatal: no existe la rama: $branch_name"
+
+#: git-rebase.sh:572
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#: git-rebase.sh:577
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr "Autostash creado: $stash_abbrev"
+
+#: git-rebase.sh:581
+msgid "Please commit or stash them."
+msgstr "Por favor, confírmalos o salvaguárdalos."
+
+#: git-rebase.sh:601
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr "La rama actual $branch_name está actualizada."
+
+#: git-rebase.sh:605
+#, 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:616
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr "Cambios desde $mb a $onto:"
+
+#: git-rebase.sh:625
+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..."
+
+#: git-rebase.sh:635
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "Avance rápido de $branch_name a $onto_name."
+
+#: git-stash.sh:61
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear con parámetros no está implementado"
+
+#: git-stash.sh:102
+msgid "You do not have the initial commit yet"
+msgstr "Aún no tienes una confirmación inicial."
+
+#: git-stash.sh:117
+msgid "Cannot save the current index state"
+msgstr "No se puede guardar el estado actual del índice"
+
+#: git-stash.sh:132
+msgid "Cannot save the untracked files"
+msgstr "No se pueden guardar los archivos no rastreados"
+
+#: git-stash.sh:152 git-stash.sh:165
+msgid "Cannot save the current worktree state"
+msgstr "No se puede guardar el estado actual del árbol de trabajo"
+
+#: git-stash.sh:169
+msgid "No changes selected"
+msgstr "Sin cambios seleccionados"
+
+#: git-stash.sh:172
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "No se puede remover el índice temporal (no puede suceder)"
+
+#: git-stash.sh:185
+msgid "Cannot record working tree state"
+msgstr "No se puede grabar el estado del árbol de trabajo"
+
+#: git-stash.sh:217
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "No se puede actualizar $ref_stash con $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
+#, sh-format
+msgid ""
+"error: unknown option for 'stash save': $option\n"
+"       To provide a message, use git stash save -- '$option'"
+msgstr ""
+"error: opción desconocida para 'stash save': $option\n"
+"       Esto provee un mensaje , use git stash save -- '$option'"
+
+#: git-stash.sh:288
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
+
+#: git-stash.sh:296
+msgid "No local changes to save"
+msgstr "No hay cambios locales para guardar"
+
+#: git-stash.sh:301
+msgid "Cannot initialize stash"
+msgstr "No se puede inicializar stash"
+
+#: git-stash.sh:305
+msgid "Cannot save the current status"
+msgstr "No se puede guardar el estado actual"
+
+#: git-stash.sh:306
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
+
+#: git-stash.sh:334
+msgid "Cannot remove worktree changes"
+msgstr "No se pueden remover cambios del árbol de trabajo"
+
+#: git-stash.sh:482
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "opción desconocida: $opt"
+
+#: git-stash.sh:495
+msgid "No stash entries found."
+msgstr "No se encontraron entradas de stash."
+
+#: git-stash.sh:502
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "Se especificaron demasiadas revisiones: $REV"
+
+#: git-stash.sh:517
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$reference no es una referencia válida"
+
+#: git-stash.sh:545
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args' no es un commit estilo stash"
+
+#: git-stash.sh:556
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args' no es una referencia stash"
+
+#: git-stash.sh:564
+msgid "unable to refresh index"
+msgstr "incapaz de refrescar el índice"
+
+#: git-stash.sh:568
+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:576
+msgid "Conflicts in index. Try without --index."
+msgstr "Conflictos en índice. Intente sin --index."
+
+#: git-stash.sh:578
+msgid "Could not save index tree"
+msgstr "No se puede guardar el índice del árbol"
+
+#: git-stash.sh:587
+msgid "Could not restore untracked files from stash entry"
+msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
+
+#: git-stash.sh:612
+msgid "Cannot unstage modified files"
+msgstr "No se puede sacar de stage archivos modificados"
+
+#: git-stash.sh:627
+msgid "Index was not unstashed."
+msgstr "El índice no fue sacado de stash."
+
+#: git-stash.sh:641
+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:650
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "Botado ${REV} ($s)"
+
+#: git-stash.sh:651
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}: No se pudo borrar entrada stash"
+
+#: git-stash.sh:659
+msgid "No branch name specified"
+msgstr "No se especificó el nombre de la rama."
+
+#: git-stash.sh:738
+msgid "(To restore them type \"git stash apply\")"
+msgstr "(Para restaurarlos, escribe \"git stash apply\")"
+
+#: git-submodule.sh:181
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
+"trabajo"
+
+#: 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 ./|../"
+
+#: git-submodule.sh:210
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' ya existe en el índice"
+
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
+
+#: git-submodule.sh:219
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
+msgstr ""
+"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
+"$sm_path\n"
+"Usa -f si en verdad quieres agregarlo."
+
+#: 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'"
+
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' ya existe y no es un repositorio git válido"
+
+#: git-submodule.sh:247
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+"Se encontró localmente un directorio git para '$sm_name' con el(los) "
+"remoto(s):"
+
+#: 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."
+msgstr ""
+"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
+"  $realrepo\n"
+"use la opción '--force'. Si el directorio git local no es el repositorio "
+"correcto\n"
+"o no está seguro de lo que esto significa, escoja otro nombre con la opción "
+"'--name'."
+
+#: git-submodule.sh:255
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
+
+#: git-submodule.sh:267
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "No es posible hacer checkout al submódulo '$sm_path'"
+
+#: git-submodule.sh:272
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "Fallo al agregar el submódulo '$sm_path'"
+
+#: git-submodule.sh:281
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "Fallo al registrar el submódulo '$sm_path'"
+
+#: git-submodule.sh:342
+#, sh-format
+msgid "Entering '$displaypath'"
+msgstr "Entrando a '$displaypath'"
+
+#: git-submodule.sh:362
+#, sh-format
+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
+#, 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
+#, 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
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
+"de submódulo  '$sm_path'"
+
+#: git-submodule.sh:670
+#, 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
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
+"Fetch directo del commit falló."
+
+#: git-submodule.sh:683
+#, 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
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
+
+#: git-submodule.sh:688
+#, 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
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
+
+#: git-submodule.sh:694
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo"
+
+#: git-submodule.sh:695
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
+
+#: git-submodule.sh:700
+#, 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
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
+
+#: git-submodule.sh:732
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
+
+#: git-submodule.sh:840
+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:892
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "modo $mod_dst inesperado"
+
+#: git-submodule.sh:912
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+msgstr "  Advertencia: $display_name no contiene la confirmación $sha1_src"
+
+#: git-submodule.sh:915
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr "  Advertencia: $display_name no contiene la confirmación $sha1_dst"
+
+#: git-submodule.sh:918
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr ""
+"Advertencia: $display_name no contiene las confirmaciones $sha1_src y "
+"$sha1_dst"
+
+#: git-submodule.sh:1064
+#, sh-format
+msgid "Failed to recurse into submodule path '$sm_path'"
+msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'"
+
+#: git-submodule.sh:1136
+#, sh-format
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "Sincronizando url de submódulo para '$displaypath'"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Véase git-${cmd}(1) para más detalles."
+
+#: git-rebase--interactive.sh:140
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Rebasando ($new_count/$total)"
+
+#: git-rebase--interactive.sh:156
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandos:\n"
+" p, pick = usar commit\n"
+" r, reword = usar commit, pero editar el mensaje\n"
+" e, edit = usar commit, pero detener para enmendar\n"
+" s, squash = usar commit, pero unirlo al commit previo\n"
+" f, fixup = como \"squash\", pero descartar el mensaje del commit en el log\n"
+" x, exec = ejecutar comando (el resto de la línea) usando un shell\n"
+" d, drop = borrar commit\n"
+"\n"
+"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia "
+"abajo.\n"
+
+#: git-rebase--interactive.sh:171
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"No eliminar ninguna línea. Usa 'drop' explícitamente para eliminar una "
+"confirmación.\n"
+
+#: git-rebase--interactive.sh:175
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si remueves una línea aquí EL COMMIT SE PERDER�.\n"
+
+#: git-rebase--interactive.sh:211
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Puede enmendar el commit ahora, con\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Una vez que esté satisfecho con los cambios, ejecute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:236
+#, 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
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nombre de confirmación inválido: $sha1"
+
+#: git-rebase--interactive.sh:317
+msgid "Cannot write current commit's replacement sha1"
+msgstr "No se puede escribir el remplazo sha1 del commit actual"
+
+#: git-rebase--interactive.sh:369
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Avance rápido a $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "No se puede realizar avance rápido a $sha1"
+
+#: git-rebase--interactive.sh:380
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "No se puede mover HEAD a $first_parent"
+
+#: git-rebase--interactive.sh:385
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Rehusando a ejecutar squash en fusión: $sha1"
+
+#: git-rebase--interactive.sh:400
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Error rehaciendo fusión $sha1"
+
+#: git-rebase--interactive.sh:408
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "No se pudo coger $sha1"
+
+#: git-rebase--interactive.sh:417
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Este es el mensaje de la confirmación #${n}:"
+
+#: git-rebase--interactive.sh:422
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "El mensaje de confirmación #${n} será ignorado:"
+
+#: git-rebase--interactive.sh:433
+#, 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 confirmación."
+msgstr[1] "Esta es la combinación de $count confirmaciones."
+
+#: git-rebase--interactive.sh:442
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "No se puede escribir $fixup_msg"
+
+#: git-rebase--interactive.sh:445
+msgid "This is a combination of 2 commits."
+msgstr "Esto es una combinación de 2 confirmaciones."
+
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "No se puede aplicar $sha1... $rest"
+
+#: git-rebase--interactive.sh:560
+#, 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"
+"you are able to reword the commit."
+msgstr ""
+"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
+"$rest\n"
+"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
+"commit\n"
+"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el "
+"problema antes\n"
+"de que sea capaz de reformular el commit."
+
+#: git-rebase--interactive.sh:575
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Detenido en $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:590
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "no se puede '$squash_style' sin una confirmación previa"
+
+#: git-rebase--interactive.sh:632
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Ejecutando: $rest"
+
+#: git-rebase--interactive.sh:640
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Ejecución fallida: $rest"
+
+#: git-rebase--interactive.sh:642
+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
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Puedes corregir el problema y entonces ejecutar\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:657
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"La ejecución tuvo éxito: $rest\n"
+"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
+"Realice un commit o stash con los cambios y, a continuación, ejecute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:668
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Comando desconocido: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:669
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:704
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "$head_name rebasado y actualizado satisfactoriamente."
+
+#: git-rebase--interactive.sh:749
+msgid "could not detach HEAD"
+msgstr "No se puede desacoplar HEAD"
+
+#: git-rebase--interactive.sh:784
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "No se pudo remover CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:789
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"TIene cambios en el area de stage de su arbol de trabajo.\n"
+"Si estos cambios estan destinados a \n"
+"ser aplastados en el commit previo, ejecute:\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Si estos estan destinados a ir en un nuevo comit, ejecute:\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"En ambos casos, cuando termite, continue con:\n"
+"\n"
+"  git rebase --continue\n"
+
+#: git-rebase--interactive.sh:806
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Error tratando de encontrar la identidad del autor para remediar el commit "
+
+#: git-rebase--interactive.sh:811
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+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:816 git-rebase--interactive.sh:820
+msgid "Could not commit staged changes."
+msgstr "No se pudo realizar el commit con los cambios en el area de stage"
+
+#: git-rebase--interactive.sh:848
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Esta editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase despues de editar, ejecute:\n"
+"    git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
+msgid "Could not execute editor"
+msgstr "No se pudo ejecutar el editor"
+
+#: git-rebase--interactive.sh:869
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
+
+#: git-rebase--interactive.sh:874
+msgid "No HEAD?"
+msgstr "¿Sin HEAD?"
+
+#: git-rebase--interactive.sh:875
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "No se pudo crear $state_dir temporalmente"
+
+#: git-rebase--interactive.sh:877
+msgid "Could not mark as interactive"
+msgstr "No se pudo marcar como interactivo"
+
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
+msgid "Could not init rewritten commits"
+msgstr "No se puede inicializar los commits reescritos"
+
+#: git-rebase--interactive.sh:993
+#, 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:998
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Como sea, si se remueve todo, el rebase sera abortado.\n"
+"\n"
+
+#: git-rebase--interactive.sh:1005
+msgid "Note that empty commits are commented out"
+msgstr "Nota que los commits vacios estan comentados"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "uso: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: $program_name no puede ser usado sin un arbol de trabajo."
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr ""
+"No se puede aplicar rebase: Tienes cambios que no estan en el area de stage."
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"No se puede reescribir las ramas: Tienes cambios que no estan en el area de "
+"stage"
+
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"No se puede aplicar pull con rebase: Tienes cambios que no estan en el area "
+"de stage."
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "No se puede $action: Tienes cambios que no estan en el area de stage"
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"No se puede hacer rebase: Tu indice contiene cambios que no estan en un "
+"commit."
+
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"No se puede hacer pull con rebase: Tu indice contiene cambios que no estan "
+"en un commit."
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "No se puede $action: El índice contiene cambios sin confirmar."
+
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Adicionalmente, tu indice contiene cambios que no estan en un commit."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
+"trabajo."
+
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Incapaz de determinar la ruta absoluta del directorio git"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:196
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:197
+msgid "staged"
+msgstr "rastreado"
+
+#: git-add--interactive.perl:197
+msgid "unstaged"
+msgstr "no rastreado"
+
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
+msgid "binary"
+msgstr "binario"
+
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
+msgid "nothing"
+msgstr "nada"
+
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
+msgid "unchanged"
+msgstr "sin cambios"
+
+#: git-add--interactive.perl:602
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "agregada %d ruta\n"
+msgstr[1] "agregadas %d rutas\n"
+
+#: git-add--interactive.perl:605
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualizada %d ruta\n"
+msgstr[1] "actualizadas %d rutas\n"
+
+#: git-add--interactive.perl:608
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "revertida %d ruta\n"
+msgstr[1] "revertidas %d rutas\n"
+
+#: git-add--interactive.perl:611
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "touch hecho a %d ruta\n"
+msgstr[1] "touch hecho a %d rutas\n"
+
+#: git-add--interactive.perl:620
+msgid "Update"
+msgstr "Actualizar"
+
+#: git-add--interactive.perl:632
+msgid "Revert"
+msgstr "Revertir"
+
+#: git-add--interactive.perl:655
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s no es rastreado ahora.\n"
+
+#: git-add--interactive.perl:666
+msgid "Add untracked"
+msgstr "Agregar no rastreados"
+
+#: git-add--interactive.perl:672
+msgid "No untracked files.\n"
+msgstr "No hay archivos sin rastrear.\n"
+
+#: git-add--interactive.perl:985
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para el area de stage."
+
+#: git-add--interactive.perl:988
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para aplicar stash."
+
+#: git-add--interactive.perl:991
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para sacar del area de stage."
+
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+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
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
+"inmediatamente para descarte."
+
+#: git-add--interactive.perl:1013
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "fallo al abrir el archivo de edicion del hunk para escritura: %s"
+
+#: git-add--interactive.perl:1014
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Modo de edicion manual de hunk -- vea abajo para una guia rapida.\n"
+
+#: git-add--interactive.perl:1020
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Para remover '%s' lineas, haga de ellas lineas  ' '  (contexto).\n"
+"Para remover '%s' lineas, borrelas.\n"
+"Lineas comenzando con  %s seran removidas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1028
+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 esto no aplica de manera limpia, se le da la oportunidad de \n"
+"editar nuevamente. Si todas las lineas del hunk son removidas, entonces \n"
+"la edicion es abortada y el hunk queda sin cambios.\n"
+
+#: git-add--interactive.perl:1042
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "fallo al abrir el archivo de edicion del hunk para lectura: %s"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. 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]? "
+msgstr ""
+"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
+
+#: git-add--interactive.perl:1143
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar stage a este hunk\n"
+"n - no aplicar stage a este hunk\n"
+"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"
+"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
+"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"archivo"
+
+#: git-add--interactive.perl:1149
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar stash a este hunk\n"
+"n - no aplicar stash a este hunk\n"
+"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n"
+"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
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - sacar deste hunk del area de stage\n"
+"n - no sacar este hunk del area de stage\n"
+"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n"
+"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
+"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
+"archivo"
+
+#: git-add--interactive.perl:1161
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"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"
+"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
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - descartar este hunk del arbol de trabajo\n"
+"n - no descartar este hunk del arbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que restantes\n"
+"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
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - descartar este hunk del indice y el arbol de trabajo\n"
+"n - no descartar este hunk del indice ni el arbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que quedan\n"
+"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
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"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 arbol de trabajo\n"
+"n - no aplicar este hunk al indice y al arbol 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
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - selecciona un hunk a donde ir\n"
+"/ - buscar un hunk que concuerde el  regex\n"
+"j - dejar este hunk por definir, ver siguiente hunk por definir\n"
+"J - dejar este hunk por definird, ver siguiente hunk\n"
+"k - dejar este hunk por definir, ver hunk previo por definir\n"
+"K - dejar este hunk por definir, ver hunk previo\n"
+"s - dividir el  hunk actual en hunks mas pequenos\n"
+"e - editar manualmente el hunk actual\n"
+"? - imprimir ayuda\n"
+
+#: git-add--interactive.perl:1219
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Los hunks seleccionados no aplican al indice!\n"
+
+#: git-add--interactive.perl:1220
+msgid "Apply them to the worktree anyway? "
+msgstr "Aplicarlos al arbol de trabajo de todas maneras?"
+
+#: git-add--interactive.perl:1223
+msgid "Nothing was applied.\n"
+msgstr "Nada fue aplicado.\n"
+
+#: git-add--interactive.perl:1234
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "ignorando lo no fusionado: %s\n"
+
+#: git-add--interactive.perl:1243
+msgid "Only binary files changed.\n"
+msgstr "Solo cambiaron archivos binarios.\n"
+
+#: git-add--interactive.perl:1245
+msgid "No changes.\n"
+msgstr "Sin cambios.\n"
+
+#: git-add--interactive.perl:1253
+msgid "Patch update"
+msgstr "Actualizacion de parche"
+
+#: git-add--interactive.perl:1305
+#, 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,?]? "
+
+#: git-add--interactive.perl:1306
+#, perl-format
+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
+#, perl-format
+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
+#, 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,?]? "
+
+#: git-add--interactive.perl:1311
+#, perl-format
+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
+#, perl-format
+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
+#, 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,?]? "
+
+#: git-add--interactive.perl:1316
+#, perl-format
+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
+#, perl-format
+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
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicarcambio de modo al indice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1321
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar borrado al indice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1322
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar este hunk al indice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1325
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar cambio de modo del arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1326
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar borrado del arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1327
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar este hunk del arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1330
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar cambio de modo del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1331
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar borrado del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1332
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar este hunk del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1335
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Aplicar cambio de modo para el indice y el arbol de trabajo [y,n,q,a,d,/"
+"%s,?]? "
+
+#: git-add--interactive.perl:1336
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar borrado al indice y al arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1337
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar este hunk al indice y arbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1440
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "A que hunk ir (<enter> para ver mas)?"
+
+#: git-add--interactive.perl:1442
+msgid "go to which hunk? "
+msgstr "A que hunk ir?"
+
+#: git-add--interactive.perl:1451
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Numero invalido: '%s'\n"
+
+#: git-add--interactive.perl:1456
+#, 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
+msgid "search for regex? "
+msgstr "buscar para regexp?"
+
+#: git-add--interactive.perl:1495
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "regexp para la busqueda mal formado %s: %s\n"
+
+#: git-add--interactive.perl:1505
+msgid "No hunk matches the given pattern\n"
+msgstr "No hay hunks que concuerden con el patron entregado.\n"
+
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+msgid "No previous hunk\n"
+msgstr "No el anterior hunk\n"
+
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+msgid "No next hunk\n"
+msgstr "No el siguiente hunk\n"
+
+#: git-add--interactive.perl:1553
+#, 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
+msgid "Review diff"
+msgstr "Revision de  diff"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1624
+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"
+msgstr ""
+"status        - muestra las rutas con cambioss\n"
+"update        - agrega el estado del arbol de trabajo al set de cambios en "
+"el area de stage\n"
+"revert        - revierte los cambios en el area de stage de regreso a la "
+"version HEAD\n"
+"patch         - selecciona los hunks y actualiza de forma selectiva\n"
+"diff          - mirar la diff entre HEAD y el indice\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
+msgid "missing --"
+msgstr "falta --"
+
+#: git-add--interactive.perl:1662
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "modo --patch desconocido: %s"
+
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "argumento invalido %s, se esperaba --"
+
+#: git-send-email.perl:126
+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
+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
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "el editor se cerro inapropiadamente, abortando todo"
+
+#: git-send-email.perl:290
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contiene una version intermedia del correo que se estaba generando.\n"
+
+#: git-send-email.perl:295
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' contiene el email generado.\n"
+
+#: git-send-email.perl:313
+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
+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
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "campo --suppress-cc desconocido: '%s'\n"
+
+#: git-send-email.perl:476
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Configuracion --confirm desconocida: '%s'\n"
+
+#: git-send-email.perl:504
+#, 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
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "peligro: `:include:` no soportado: %s\n"
+
+#: git-send-email.perl:508
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "peligro: redireccion `/file` or `|pipe` no soportada : %s\n"
+
+#: git-send-email.perl:513
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "peligro: linea sendmail no reconocida: %s\n"
+
+#: git-send-email.perl:595
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Archivo '%s' existe pero podria ser el rango de commits \n"
+"para producir los parches.  Por favor elimina la ambiguedad...\n"
+"\n"
+"    * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
+"    * Agregando la opcion --format-patch si se quiere decir un rango.\n"
+
+#: git-send-email.perl:616
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Fallo al abrir directorio %s: %s"
+
+#: git-send-email.perl:640
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: %s\n"
+"peligro: no se mandaron parches\n"
+
+#: git-send-email.perl:651
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"No se especificaron parches!\n"
+"\n"
+
+#: git-send-email.perl:664
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "No hay linea de subject en %s?"
+
+#: git-send-email.perl:674
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Fallo al abir para escritura %s: %s"
+
+#: git-send-email.perl:684
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"Lineas que comienzan en \"GIT:\" seran 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
+#, 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 todavia, han sido ignorados\n"
+
+#: git-send-email.perl:754
+msgid "Summary email is empty, skipping it\n"
+msgstr "Archivo de resumen esta vacio, saltando al siguiente\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:786
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Esta seguro de que desea 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 ""
+"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
+"Encoding.\n"
+
+#: git-send-email.perl:820
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Que codificacion de 8bit deberia declarar [UTF-8]?"
+
+#: git-send-email.perl:828
+#, 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"
+msgstr ""
+"Rehusando mandar el parche porque\n"
+"\t%s\n"
+"tiene el template  '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
+"deseas mandar.\n"
+
+#: git-send-email.perl:847
+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
+#, 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
+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)?"
+
+#: git-send-email.perl:927 git-send-email.perl:935
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "error: no es posible extraer una direccion 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:939
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Que hacer con esta direccion? ([q]salir|[d]botar|[e]ditar):"
+
+#: git-send-email.perl:1260
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "ruta CA \"%s\" no existe"
+
+#: git-send-email.perl:1335
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    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 configuracion sendemail."
+"confirm.\n"
+"\n"
+"Para mas informacion, corre 'git sen-email --help'.\n"
+"Para mantener el comportamiento actual, pero evitar este mensaje,\n"
+"corre '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:1350
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):"
+
+#: git-send-email.perl:1353
+msgid "Send this email reply required"
+msgstr "Necesitas mandar esta respuesta de email"
+
+#: git-send-email.perl:1379
+msgid "The required SMTP server is not properly defined."
+msgstr "El servidor SMTP no esta definido adecuadamente."
+
+#: git-send-email.perl:1426
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Servidor no soporta STARTLS! %s"
+
+#: git-send-email.perl:1431 git-send-email.perl:1435
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "fallo de STARTTLS! %s"
+
+#: git-send-email.perl:1445
+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:1463
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Fallo al enviar %s\n"
+
+#: git-send-email.perl:1466
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Dry-Sent %s\n"
+
+#: git-send-email.perl:1466
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Enviado %s\n"
+
+#: git-send-email.perl:1468
+msgid "Dry-OK. Log says:\n"
+msgstr "Dry-OK. Log dice:\n"
+
+#: git-send-email.perl:1468
+msgid "OK. Log says:\n"
+msgstr "OK. Log dice:\n"
+
+#: git-send-email.perl:1480
+msgid "Result: "
+msgstr "Resultado:"
+
+#: git-send-email.perl:1483
+msgid "Result: OK\n"
+msgstr "Resultado: OK\n"
+
+#: git-send-email.perl:1496
+#, perl-format
+msgid "can't open file %s"
+msgstr "no se puede abrir el archivo %s"
+
+#: git-send-email.perl:1543 git-send-email.perl:1563
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Agregando cc: %s de linea '%s'\n"
+
+#: git-send-email.perl:1549
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Agregando para: %s de la linea '%s'\n"
+
+#: git-send-email.perl:1597
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Agregando cc: %s de la linea '%s'\n"
+
+#: git-send-email.perl:1622
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) Agregando cc: %s de la linea '%s'\n"
+
+#: git-send-email.perl:1728
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) no se pudo ejecutar '%s'"
+
+#: git-send-email.perl:1735
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Agregando %s: %s de: '%s'\n"
+
+#: git-send-email.perl:1739
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) fallo al cerrar el pipe para '%s'"
+
+#: git-send-email.perl:1766
+msgid "cannot send message as 7bit"
+msgstr "no se puede mandar mensaje como 7bit"
+
+#: git-send-email.perl:1774
+msgid "invalid transfer encoding"
+msgstr "codificacion de transferencia invalida"
+
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "no es posible abrir %s: %s\n"
+
+#: git-send-email.perl:1815
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: el parche contiene una linea con mas de 998 caracteres"
+
+#: git-send-email.perl:1831
+#, 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:1835
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Realmente deseas mandar %s?[y|N]"
+
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no toma argumentos"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "cambie info de upstream"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nombre base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "anteponer el nombre base del proyecto padre a la salida"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: el comando no es reconocido en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'."
diff --git a/po/fr.po b/po/fr.po
index cb45f57b3..4deae3318 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -50,6 +50,7 @@
 #   to prune         |  éliminer
 #   to push          |  pousser
 #   to rebase        |  rebaser
+#   trailers         |  lignes terminales
 #   repository       |  dépôt
 #   remote           |  distante (ou serveur distant)
 #   revision         |  révision
@@ -73,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: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-23 04:35+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-18 20:28+0200\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"
@@ -125,7 +126,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
@@ -179,89 +180,89 @@ msgstr "option d'espace non reconnue '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "option d'ignorance d'espace non reconnue '%s'"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way hors d'un dépôt"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index hors d'un dépôt"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached hors d'un dépôt"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Impossible de préparer la regexp d'horodatage %s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec a retourné %d pour l'entrée : %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "nom de fichier du patch introuvable à la ligne %d"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
 "ligne %d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode invalide dans la ligne %d : %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "lignes d'entête inconsistantes %d et %d"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recomptage : ligne inattendue : %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -276,83 +277,83 @@ msgstr[1] ""
 "information de nom de fichier manquante dans l'en-tête de git diff lors de "
 "la suppression de %d composants de préfixe de chemin (ligne %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dépend de contenus anciens"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "le fichier supprimé a encore du contenu"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu à la ligne %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dépend de contenus anciens"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimé %s a encore du contenu"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -361,456 +362,457 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
 "inverse"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
 "trouvé)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "échec de la lecture de %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob 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."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retour à une fusion à 3 points…\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Echec du retour à une fusion à 3 points…\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "création du magasin de stockage pour le fichier nouvellement créé %s "
 "impossible"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "échec de l'écriture dans '%s'"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Application du patch %%s avec %d rejet..."
 msgstr[1] "Application du patch %%s avec %d rejets..."
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "entrée non reconnue"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erreur d'espace ignorée"
 msgstr[1] "%d erreurs d'espace ignorées"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ligne a ajouté des erreurs d'espace."
 msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
 msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 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:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "chemin"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "num"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "s'assurer que le patch est applicable sur l'index actuel"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:4947
+#: apply.c:4973
 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:4975
 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:4977
 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:4979
 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:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:4958
+#: apply.c:4984
 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:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "action"
 
-#: apply.c:4960
+#: apply.c:4986
 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:4989 apply.c:4992
 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:4995
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:4971
+#: apply.c:4997
 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:4999
 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:5001
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "mode verbeux"
 
-#: apply.c:4978
+#: apply.c:5004
 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:5007
 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:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "racine"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
@@ -833,108 +835,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "le chemin '%s' ne correspond à aucun fichier"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "préfixe"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "fichier"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "écrire l'archive dans ce fichier"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "lire .gitattributes dans le répertoire de travail"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "afficher les fichiers archivés sur stderr"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "stockage seulement"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "compression rapide"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "compression efficace"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "dépôt"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "commande"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "chemin vers la commande distante git-upload-archive"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'archive inconnu '%s'"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument non supporté pour le format '%s' : -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1012,31 +1014,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1045,7 +1047,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:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1055,7 +1057,7 @@ msgstr[1] "(à peu près %d étapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1076,10 +1078,10 @@ msgstr ""
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "échec de la préparation du parcours des révisions"
 
@@ -1120,50 +1122,53 @@ msgstr "La branche %s ne peut pas être sa propre branche amont."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
-"La branche %s est paramétrée pour suivre la branche distante %s de %s en "
-"rebasant."
+"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
+"en rebasant."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
-"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."
+"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
+"'%s'."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
-"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."
+"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
+"rebasant."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "La branche %s est paramétrée pour suivre la branche locale %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
-"La branche %s est paramétrée pour suivre la référence distante %s en "
+"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
 "rebasant."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "La branche %s est paramétrée pour suivre la référence distante %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
-"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
+"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
+"rebasant."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branche %s est paramétrée pour suivre la référence locale %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1184,23 +1189,23 @@ msgstr "'%s' n'est pas un nom de branche valide."
 msgid "A branch named '%s' already exists."
 msgstr "Une branche nommée '%s' existe déjà."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "Impossible de forcer la mise à jour de la branche courante."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
 "pas une branche."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branche amont demandée '%s' n'existe pas"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1220,22 +1225,22 @@ msgstr ""
 "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
 "pour paramétrer le suivi distant en même temps que vous poussez."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Nom d'objet invalide : '%s'."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Nom d'objet ambigu : '%s'."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Point d'embranchement invalide : '%s'."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
@@ -1255,7 +1260,9 @@ 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:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
@@ -1264,56 +1271,56 @@ msgstr "impossible d'ouvrir '%s'"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:186
+#: bundle.c:193
 #, 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:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Le colis enregistre l'historique complet."
 
-#: bundle.c:195
+#: bundle.c:202
 #, 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:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de créer des objets groupés"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "les objets groupés ont disparu"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "rev-list a disparu"
 
-#: bundle.c:356
+#: bundle.c:363
 #, 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:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
@@ -1322,8 +1329,8 @@ msgstr "l'index de groupe a disparu"
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
@@ -1333,7 +1340,7 @@ msgstr "impossible d'analyser %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s n'est pas un commit !"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1349,171 +1356,171 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "plus de mémoire"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "les conditions d'inclusion de configuration relative doivent venir de "
 "fichiers"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ligne %d de config incorrecte dans le blob %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ligne %d de config incorrecte dans le fichier %s"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ligne %d de config incorrecte dans l'entrée standard"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ligne %d de config incorrecte dans %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "hors plage"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "unité invalide"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
 "%s : %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
 "%s : %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
 "standard : %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
 "sous-module %s : %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
 "commande %s : %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2085
+#: config.c:2130
 #, 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:2111
+#: config.c:2156
 #, 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:2122
+#: config.c:2167
 #, 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:2124
+#: config.c:2169
 #, 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:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de désinitialiser '%s'"
@@ -1534,19 +1541,19 @@ msgstr ""
 "Veuillez vérifier que vous avez les droits d'accès\n"
 "et que le dépôt existe."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "impossible d'écrire dans la rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrée standard du rev-list"
 
@@ -1657,29 +1664,37 @@ msgstr "impossible de lire le fichier de commande '%s'"
 msgid "Performing inexact rename detection"
 msgstr "Détection de renommage inexact en cours"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
+"'zebra', 'dimmed_zebra', 'plain'"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1688,20 +1703,20 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1710,24 +1725,24 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
 
-#: diff.c:4716
+#: diff.c:5505
 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:4719
+#: diff.c:5508
 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:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1735,207 +1750,211 @@ msgstr ""
 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
 "commande."
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2067
+#: dir.c:2102
 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:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de créer les répertoires pour %s"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtrage du contenu"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : list courte attendue"
 
-#: fetch-pack.c:263
+#: 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:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc nécessite multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "Erreur dans l'objet : %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvé"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Le serveur supporte multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Le serveur support no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Le serveur supporte multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Le serveur supporte side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Le serveru supporte side-band"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Le serveur supporte allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Le serveur supporte allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Le serveur support ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, 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é"
@@ -1948,7 +1967,7 @@ msgstr "gpg n'a pas pu signer les données"
 msgid "could not create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "impossible d'écrire la signature détachée dans '%s'"
@@ -1958,17 +1977,17 @@ 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:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "échec du stat de '%s'"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
@@ -2008,13 +2027,13 @@ msgstr ""
 #: help.c:363
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuons en supposant que vous avez voulu dire '%s'<"
+msgstr "Continuons en supposant que vous avez voulu dire '%s'."
 
 #: help.c:368
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
-"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<"
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
 
 #: help.c:376
 #, c-format
@@ -2112,12 +2131,12 @@ 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:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2136,7 +2155,7 @@ msgstr ""
 "un processus git peut avoir planté :\n"
 "supprimez le fichier manuellement pour poursuivre."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Impossible de créer '%s.lock' : %s"
@@ -2145,78 +2164,78 @@ msgstr "Impossible de créer '%s.lock' : %s"
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(mauvais commit)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "échec de addinfo_cache pour le chemin '%s'"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "erreur de construction des arbres"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de créer le chemin '%s' %s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-être un conflit D/F ?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "échec à l'ouverture de '%s' : %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "échec à la création du lien symbolique '%s' : %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "Échec à l'exécution de la fusion interne"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossible d'ajouter %s à la base de données"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2225,7 +2244,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:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2234,7 +2253,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:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2243,7 +2262,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:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2252,20 +2271,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:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "renommé"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, 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:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2274,141 +2293,141 @@ msgstr ""
 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (laissé non résolu)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, 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:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Ajout de %s fusionné"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutôt comme %s"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objet %s n'est pas un blob"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "modifié"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "contenu"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "ajout/ajout"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sauté (fusion identique à l'existant)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "sous-module"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "fichier/répertoire"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "répertoire/fichier"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Déjà à jour !"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, 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:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2419,7 +2438,7 @@ msgstr ""
 "Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
 "pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
@@ -2447,16 +2466,31 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Mauvaise valeur de %s : '%s'"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
+
+#: packfile.c:1683
+#, 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
+#, 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
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -2464,17 +2498,17 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2483,7 +2517,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "nom d'objet malformé '%s'"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -2562,7 +2596,7 @@ msgstr ""
 "%s : le spécificateur magique de chemin n'est pas supporté par cette "
 "commande : %s"
 
-#: pathspec.c:575
+#: 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"
@@ -2571,12 +2605,12 @@ msgstr ""
 "invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
 "correspondre à tous le chemins"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "le chemin '%s' est au-delà d'un lien symbolique"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
@@ -2598,50 +2632,51 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le répertoire git : %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Impossible d'ouvrir '%s' en écriture"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "mises à jour des références interdites en environnement de quarantaine"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossible de supprimer la référence %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Impossible de supprimer la référence %s : %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les références : %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
-
 # à priori on parle d'une branche ici
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
@@ -2672,147 +2707,147 @@ msgstr "format attendu : %%(color:<couleur>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "couleur non reconnue : %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valeur entière attendue refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entière attendue refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) non reconnu : %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) n'accepte pas d'argument"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) n'accepte pas d'argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argument %%(trailers) inconnu : %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argument %%(contents) non reconnu : %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valeur positive attendue objectname:short=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argument %%(objectname) non reconnu : %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format attendu : %%(align:<largeur>,<position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "position non reconnue : %s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnue : %s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argument %%(align) non reconnu : %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "valeur positive attendue avec l'atome %%(align)"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argument %%(if) non reconnu : %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de champ malformé %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de champ inconnu : %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format : atome %%(then) utilisé plus d'une fois"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisé après %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format : atome %%(else) utilisé plus d'une fois"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format : atome %%(end) utilisé sans atome correspondant"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "Chaîne de formatage mal formée %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(aucune branche, rebasage de %s)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(aucune branche, bisect a démarré sur %s)"
@@ -2820,7 +2855,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD détachée sur %s)"
@@ -2828,110 +2863,110 @@ msgstr "(HEAD détachée sur %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD détachée depuis %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(aucune branche)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "echec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformé à '%s'"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: remote.c:747
+#: remote.c:750
 #, 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:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1698
+#: remote.c:1699
 #, 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:1713
+#: remote.c:1714
 #, 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:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1736
+#: remote.c:1737
 #, 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:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
@@ -2947,7 +2982,7 @@ msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
 #: remote.c:2087
@@ -2997,16 +3032,16 @@ 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:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2190
+#: revision.c:2259
 #, 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:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent est incompatible avec --bisect"
 
@@ -3048,24 +3083,24 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"
 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gère pas les options de poussées"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Action inconnue : %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3073,7 +3108,7 @@ msgstr ""
 "après résolution des conflits, marquez les chemins corrigés\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3083,42 +3118,43 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "échec lors de la finalisation de '%s'."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "vos modifications locales seraient écrasées par %s."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
@@ -3126,20 +3162,20 @@ msgstr "%s : avance rapide"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "impossible de résoudre le commit HEAD\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "impossible de mettre à jour l'arbre de cache\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3168,17 +3204,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "impossible d'analyser le commit %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "impossible d'analyser le commit parent %s\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3189,7 +3225,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3200,232 +3236,233 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'écrire '%s'"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validation :"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numéro %d :"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignoré :"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, 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:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, 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:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un picorage ou un retour est déjà en cours"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, 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:1658
+#: sequencer.c:1677
 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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "impossible de lire l'index"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3440,11 +3477,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 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:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3461,17 +3498,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3482,57 +3519,57 @@ 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:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrêt à %s... %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3542,24 +3579,112 @@ 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:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script : options non gérées"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script : erreur lors de la préparation des révisions"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "liste à faire inutilisable : '%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: sequencer.c:2561
+#, 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:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error.\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "impossible d'analyser le commit '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "impossible de tronquer '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "le script a déjà été réarrangé."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "impossible de finir '%s'"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3592,34 +3717,34 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dépôt git <= %d, %d trouvée"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "extensions de dépôt inconnues trouvées :"
 
-#: setup.c:810
+#: setup.c:806
 #, 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:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Impossible de modifié en '%s'"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3630,7 +3755,7 @@ msgstr ""
 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "n'est pas activé)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3640,58 +3765,43 @@ msgstr ""
 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
 "écriture."
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, 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:592
+#: sha1_file.c:560
 #, 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:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dépôt de référence '%s' est superficiel"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dépôt de référence '%s' est greffé"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-
-#: sha1_file.c:2729
-#, 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 ?)"
-
-#: sha1_file.c:2733
-#, 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é ?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "le SHA1 court %s est ambigu"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Les candidats sont :"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3716,67 +3826,72 @@ msgstr ""
 "message\n"
 "en lançant \"git config advice.objectNameWarning false\""
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "
 "d'abord"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
 
 # ici %s est un chemin
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "échec de la mise en index du .gitmodules mis à jour"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "dans le sous-module '%s' non populé"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+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:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Échec de résolution de HEAD comme référence valide."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' n'est pas reconnu comme dépôt git"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3784,18 +3899,18 @@ msgstr ""
 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
 "n'est pas supporté"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le répertoire '%s'"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3806,94 +3921,98 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "impossible de démarrer ls-files dans .."
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyé un code de retour inattendu %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "Valeur invalide pour %s"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "échec de la commande trailer '%s'"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "valeur inconnue '%s' pour la clé '%s'"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "plus d'un %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "symbole vide dans la ligne de fin '%.*s'"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "impossible de lire le fichier d'entrée '%s'"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "Impossible de lire depuis l'entrée standard"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "stat impossible de %s"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "%s n'est pas un fichier régulier"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "impossible de renommer un fichier temporaire en %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport : option de profondeur invalide '%s'"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3902,7 +4021,7 @@ msgstr ""
 "Les chemins suivant de sous-module contiennent des modifications\n"
 "qui ne peuvent être trouvées sur aucun distant :\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3929,7 +4048,7 @@ msgstr ""
 "pour les pousser vers un serveur distant.\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Abandon."
 
@@ -3950,11 +4069,11 @@ msgstr "mode invalide dans l'entrée d'arbre"
 msgid "empty filename in tree entry"
 msgstr "nom de fichier vide dans une entrée de l'arbre"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3965,7 +4084,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3975,7 +4094,7 @@ msgstr ""
 "l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3985,7 +4104,7 @@ msgstr ""
 "fusion :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3995,7 +4114,7 @@ msgstr ""
 "fusion :\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4004,7 +4123,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:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4013,7 +4132,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4023,7 +4142,7 @@ msgstr ""
 "contenus :\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4033,7 +4152,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4042,7 +4161,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4052,7 +4171,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4061,7 +4180,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4071,7 +4190,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4080,7 +4199,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4091,7 +4210,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4101,7 +4220,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4111,7 +4230,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4120,7 +4239,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4130,7 +4249,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4139,22 +4258,22 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 "Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
 "pas à jour :\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4165,7 +4284,7 @@ msgstr ""
 "jour par l'extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4176,7 +4295,7 @@ msgstr ""
 "à jour par extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4185,19 +4304,12 @@ msgstr ""
 "Mise à jour impossible pour le sous-module :\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-"stratégie de mise à jour de sous-module non supportée pour le sous-module "
-"'%s'"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "Extraction des fichiers"
 
@@ -4240,13 +4352,8 @@ msgstr "échec de la lecture de '%s'"
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
@@ -4270,202 +4377,202 @@ msgstr "Impossible d'écrire dans %s"
 msgid "could not close %s"
 msgstr "impossible de fermer %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Chemins non fusionnés :"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (utilisez \"git reset %s <fichier>...\" pour désindexer)"
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 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:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
-#: wt-status.c:222
+#: wt-status.c:220
 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:224
+#: wt-status.c:222
 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:225
+#: wt-status.c:223
 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:227
+#: wt-status.c:225
 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:239
+#: wt-status.c:237
 #, 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:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "supprimé des deux côtés :"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "ajouté par nous :"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "supprimé par eux :"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "ajouté par eux :"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "supprimé par nous :"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "ajouté de deux côtés :"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "modifié des deux côtés :"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "nouveau fichier :"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "copié :"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "supprimé :"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "modifié :"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "renommé :"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "modif. type :"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "inconnu :"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "non fusionné :"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "nouveaux commits, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "contenu modifié, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"Ne touchez pas à la ligne ci-dessus\n"
+"Ne touchez pas à la ligne ci-dessus.\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 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:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
@@ -4735,7 +4842,7 @@ msgstr "rien à valider, la copie de travail est propre\n"
 
 #: wt-status.c:1780
 msgid "No commits yet on "
-msgstr "Encore aucun commit sur  "
+msgstr "Encore aucun commit sur "
 
 #: wt-status.c:1784
 msgid "HEAD (no branch)"
@@ -4764,7 +4871,7 @@ msgstr "de plus, votre index contient des modifications non validées."
 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:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec lors de l'unlink de '%s'"
@@ -4778,7 +4885,7 @@ msgstr "git add [<options>] [--] <chemin>..."
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
@@ -4787,112 +4894,112 @@ msgstr "échec de la mise à jour des fichiers"
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossible d'ouvrir '%s' en écriture."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
 "d'erreurs"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exécutable pour les fichiers listés"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "avertir lors de l'ajout d'un dépôt embarqué"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4923,155 +5030,155 @@ msgstr ""
 "\n"
 "Référez-vous à \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dépôt git embarqué ajouté : %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A et -u sont mutuellement incompatibles"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "impossible d'analyser le script author"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' a été effacé par le crochet applypatch-msg"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrée malformée : '%s'."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Impossible de copier les notes de '%s' vers '%s'"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, 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:1172
+#: builtin/am.c:1194
 #, 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:1173
+#: builtin/am.c:1195
 #, 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:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 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:1588
+#: builtin/am.c:1586
 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:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5079,38 +5186,38 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 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:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -5118,35 +5225,35 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 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:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, 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:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5157,7 +5264,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5170,17 +5277,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5188,136 +5295,135 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 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:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 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:2241
+#: builtin/am.c:2240
 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:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 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:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5325,17 +5431,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:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, 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:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5344,7 +5450,7 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 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 "
@@ -5465,7 +5571,7 @@ msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
 
 #: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
-msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)"
+msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
 
 #: builtin/blame.c:683
 msgid "Ignore whitespace differences"
@@ -5537,7 +5643,7 @@ msgstr[1] "le fichier %s n'a que %lu lignes"
 
 #: builtin/blame.c:928
 msgid "Blaming lines"
-msgstr "Assignation de blâme au lignes"
+msgstr "Assignation de blâme aux lignes"
 
 #: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
@@ -5557,14 +5663,19 @@ msgstr ""
 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<options>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5573,7 +5684,7 @@ msgstr ""
 "suppression de la branche '%s' qui a été fusionnée dans\n"
 "         '%s', mais pas dans HEAD."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5582,12 +5693,12 @@ msgstr ""
 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
 "         '%s', même si elle est fusionnée dans HEAD."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Impossible de rechercher l'objet commit pour '%s'"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5596,93 +5707,116 @@ msgstr ""
 "La branche '%s' n'est pas totalement fusionnée.\n"
 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Erreur lors de la suppression de la branche '%s'"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "impossible d'analyser la chaîne de format"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "La branche %s est en cours de rebasage sur %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branche %s est en cours de bissection sur %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "impossible de copier la branche actuelle, il n'y en a pas."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Échec de copie de la branche"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Copie d'une branche mal nommée '%s'"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
-msgstr "Renommage d'un branche mal nommée '%s'"
+msgstr "Renommage d'une branche mal nommée '%s'"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La branche est renommée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La branche est copiée, mais la mise à jour du fichier de configuration a "
+"échoué"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5693,176 +5827,184 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "régler le mode de suivi (voir git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "modifier l'information amont"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "ne pas utiliser"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "Désactiver l'information amont"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "afficher seulement les branches qui contiennent le commit"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "afficher seulement les branches qui ne contiennent pas le commit"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copier une branche et son reflog"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copier une branche, même si la cible existe"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "clé"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format à utiliser pour la sortie"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Échec de résolution de HEAD comme référence valide."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column et --verbose sont incompatibles"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "trop de branches pour une opération de renommage"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "trop de branches pour une opération de copie"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "trop de branches pour spécifier une branche amont"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "trop d'arguments pour une opération de renommage"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "trop d'arguments pour spécifier une branche amont"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5870,59 +6012,47 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "trop de branches pour désactiver un amont"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "trop d'arguments pour désactiver un amont"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "créer manuellement 'HEAD' n'a pas de sens"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
-"track ou --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
-"\n"
+"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
+"upstream-to' à la place."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5937,7 +6067,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:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5945,7 +6075,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:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5953,66 +6083,66 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut être : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 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:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 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:566
+#: builtin/cat-file.c:568
 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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spécifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 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:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 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:576
+#: builtin/cat-file.c:578
 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:579
+#: builtin/cat-file.c:581
 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:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
@@ -6041,7 +6171,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:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
@@ -6133,9 +6263,9 @@ msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "chaîne"
 
@@ -6208,54 +6338,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6278,7 +6408,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6307,162 +6437,162 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, 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:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, 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:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 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:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Nom de branche manquant ; essayez -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, 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 être créée depuis."
+"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, 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:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6501,7 +6631,7 @@ msgstr "Ignorerait le dépôt %s\n"
 msgid "failed to remove %s"
 msgstr "échec de la suppression de %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6514,7 +6644,7 @@ msgstr ""
 "foo         - sélectionner un élément par un préfixe unique\n"
 "            - (vide) ne rien sélectionner\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6535,38 +6665,38 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hein (%s) ?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Sélectionner les éléments à supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Au revoir.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6584,63 +6714,63 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Commandes ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Et maintenant ?"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Supprimerait l'élément suivant :"
 msgstr[1] "Supprimerait les éléments suivants :"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimés"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas être utilisés ensemble"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6648,7 +6778,7 @@ msgstr ""
 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6656,145 +6786,145 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "spécificateur de chemin"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 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:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "heure"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "révision"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
-"ne pas cloner les tags et indiquer au récupérations futures de ne pas le "
+"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
 "faire"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 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:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6802,42 +6932,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:325
+#: builtin/clone.c:326
 #, 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:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "échec du stat de %s\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6847,102 +6977,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:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 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:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de unlinker le fichier temporaire alternates"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, 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:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, 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:967
+#: builtin/clone.c:971
 #, 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:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6950,42 +7080,42 @@ msgstr ""
 "clone --recursive n'est pas compatible avec à la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 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:1069
+#: builtin/clone.c:1073
 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:1071
+#: builtin/clone.c:1075
 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:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Je ne sais pas cloner %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, 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:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
@@ -7129,61 +7259,61 @@ msgstr ""
 "Puis \"git cherry-pick --continue\" continuera le picorage \n"
 "des commits restants.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7191,38 +7321,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:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 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:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7237,7 +7367,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7252,7 +7382,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7262,7 +7392,7 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7273,150 +7403,150 @@ 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:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, 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:1068
+#: builtin/commit.c:1075
 #, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 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:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 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:1168
+#: builtin/commit.c:1175
 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:1178
+#: builtin/commit.c:1185
 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:1180
+#: builtin/commit.c:1187
 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:1188
+#: builtin/commit.c:1195
 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:1205
+#: builtin/commit.c:1212
 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:1207
+#: builtin/commit.c:1214
 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:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 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:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "afficher l'état en format long (par défaut)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 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:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "afficher les fichiers ignorés"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7424,201 +7554,202 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "message"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "message de validation"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 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:1598
+#: builtin/commit.c:1607
 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:1599
+#: builtin/commit.c:1608
 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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "ajouter une entrée Signed-off-by :"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "défaut"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "inclure l'état dans le modèle de message de validation"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1756
 #, 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:1800
+#: builtin/commit.c:1761
+#, 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:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7786,12 +7917,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "création impossible du fichier de configuration '%s'"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7800,11 +7931,11 @@ msgstr ""
 "impossible de surcharger des valeurs multiples avec une seule valeur\n"
 "       Utilisez une regexp, --add ou --replace-all pour modifier %s."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "affiche les tailles dans un format humainement lisible"
 
@@ -7828,47 +7959,47 @@ msgstr "léger"
 msgid "annotated"
 msgstr "annoté"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'étiquette annotée %s n'est pas disponible"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'étiquette '%s' est en fait '%s'"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s n'est pas un objet '%s' valide"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "recherche de la description de %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminée à %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7877,7 +8008,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:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7886,12 +8017,12 @@ msgstr ""
 "Aucune étiquette ne peut décrire '%s'.\n"
 "Essayez --always, ou créez des étiquettes."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7901,77 +8032,77 @@ msgstr ""
 "affichées\n"
 "abandon de la recherche à %s\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'étiquette qui suit le commit"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "déboguer la stratégie de recherche sur stderr"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "utiliser n'importe quelle référence"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle étiquette, même non-annotée"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 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:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 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:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 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:462
+#: builtin/describe.c:473
 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:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long et --abbrev=0 sont incompatibles"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken est incompatible avec les commits ou assimilés"
 
@@ -7985,21 +8116,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
 msgid "invalid option: %s"
 msgstr "option invalide : %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "Ce n'est pas un dépôt git !"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
@@ -8008,27 +8139,27 @@ msgstr "objet non géré '%s' spécifié."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "échec : %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Impossible de lire l'objet %s pour le symlink %s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -8036,53 +8167,53 @@ msgstr ""
 "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
 "dans le mode de diff de répertoire ('-d' et '--dir-diff')."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a été laissé."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de répertoire"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<outil>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -8090,19 +8221,19 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
 "non-nul"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<commande>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "spécifier une commande personnalisée pour visualiser les différences"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
@@ -8110,146 +8241,146 @@ msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-révisions]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "Utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Appliquer le spécificateur de référence aux références exportées"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 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:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "répertoire"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8257,91 +8388,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:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, 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:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, 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:767
+#: builtin/fetch.c:789
 #, 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:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8350,55 +8481,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:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, 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:997
+#: builtin/fetch.c:1019
 #, 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:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "Je ne sais pas récupérer depuis %s"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8406,40 +8537,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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Vous devez spécifier un nom d'étiquette."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "Une profondeur négative dans --deepen n'est pas supportée"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen et --depth sont mutuellement exclusifs"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 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:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 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:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 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 "
@@ -8451,23 +8582,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolète)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme début de message"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "fichier d'où lire"
 
@@ -8507,102 +8638,106 @@ 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:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecter les couleurs de formatage"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "afficher seulement les références pointant sur l'objet"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "afficher seulement les références qui sont fusionnées"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "afficher seulement les références qui ne sont pas fusionnées"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "afficher seulement les références qui contiennent le commit"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 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:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 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:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<options>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Échec du stat de %s : %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "impossible de faire un stat de %s"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8618,47 +8753,47 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "éliminer les objets non référencés"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "être plus consciencieux (durée de traitement allongée)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 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:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "impossible de lire la valeur de gc.logexpiry %s"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, 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:410
+#: builtin/gc.c:411
 #, 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:411
+#: builtin/gc.c:412
 #, 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:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8666,7 +8801,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:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8677,12 +8812,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -8691,258 +8826,250 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, 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:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend un valeur numérique"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 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:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom de base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "préfixer le nom de base du projet parent à la sortie"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 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:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 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:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 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:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "afficher l'arbre d'analyse pour le motif grep"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "aucun motif fourni."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 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:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 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:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "option non supportée avec --recurse-submodules."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 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:1316
+#: builtin/grep.c:1087
 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:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "--cached et des arbres sont fournis en même temps."
 
@@ -9035,12 +9162,12 @@ msgstr "échec d'analyse de la version d'emacsclient."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "échec de l'exécution de '%s'"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -9049,7 +9176,7 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -9058,353 +9185,353 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "Définition des attributs par chemin"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Git de tous les jours avec à peu près 20 commandes"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Un glossaire Git"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "Définition des propriétés de sous-module"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spécification des révisions et portées pour Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr ""
 "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Un aperçu des flux de travail recommandés avec Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "Les guides Git populaires sont : \n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s\" est un alias de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' est un alias de '%s'"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "objet attendu non reçu %s"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, 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:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "impossible d'ouvrir le fichier paquet '%s'"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, 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:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "la décompression (inflate) a retourné %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 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:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "l'objet delta de base est hors limite"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "type d'objet inconnu %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "impossible de lire (pread) le fichier paquet"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Erreur dans l'objet"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "Réception d'objets"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide à la fin"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrême dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "Résolution des deltas"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de créer le fil : %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "confusion extrême"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "complété avec %d objet local"
 msgstr[1] "complété avec %d objets locaux"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "le paquet a %d delta non résolu"
 msgstr[1] "le paquet a %d deltas non résolus"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "impossible d'écrire le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "impossible de fermer le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, 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:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: 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:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
@@ -9536,134 +9663,166 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<symbole>[(=|:)<valeur>])...] [<fichier>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "éditer les fichiers sur place"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "éliminer les lignes de fin vides"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "où placer les nouvelles lignes terminales"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "action si les lignes terminales existent déjà"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "action si les lignes terminales manquent"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "éliminer les lignes terminales vides"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "ne pas appliquer les règles de la configuration"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "joindre les valeurs continuées avec des caractères blancs"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "paramètres d'analyse"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "ligne de fin"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "ligne(s) de fin à ajouter"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer n'a aucune signification avec --only-input"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrée pour l'éditon sur place"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "Utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 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:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "Impossible de lire l'objet %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Type inconnu : %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "le nom du répertoire de sortie est trop long"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Exactement une plage nécessaire."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "Ceci n'est pas une plage."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "La lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Deux répertoires de sortie ?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit inconnu %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, 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:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "Impossible de trouver la base de fusion exacte."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9676,221 +9835,230 @@ msgstr ""
 "ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "Impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 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:1319
+#: builtin/log.c:1323
 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:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 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:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 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:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 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:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
-msgstr "ajouter l'en-tête d'courriel"
+msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 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:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "Ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr ""
+"afficher la barre de progression durant la phase de génération des patchs"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "sortie standard, ou répertoire, lequel ?"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Génération des patchs"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "Échec de création des fichiers en sortie"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9898,106 +10066,106 @@ msgstr ""
 "Impossible de trouver une branche distante suivie, merci de spécifier "
 "<branche_amont> manuellement.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "identifier l'état de fichier avec les étiquettes"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "afficher les fichiers supprimés dans la sortie"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "afficher les fichiers modifiés dans la sortie"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "afficher les autres fichiers dans la sortie"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "afficher les fichiers ignorés dans la sortie"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "afficher les nom des objets indexés dans la sortie"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "afficher seulement les noms des répertoires 'other'"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "afficher les fins de lignes des fichiers"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "ne pas afficher les répertoires vides"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "afficher les fichiers non fusionnés dans la sortie"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "afficher l'information resolv-undo"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "sauter les fichiers correspondant au motif"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "les motifs d'exclusion sont lus depuis <fichier>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "ajouter les exclusions git standard"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "afficher en relatif par rapport au répertoire racine du projet"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "arbre ou apparenté"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
 "toujours présents"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "afficher les données de débogage"
 
@@ -10092,181 +10260,185 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vide : '%s'"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 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:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 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:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "vérifier le crochet commit-msg"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (rien à compresser)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, 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:447
+#: 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:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 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:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Options inconnue pour merge-recursive : -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, 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:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10283,70 +10455,70 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, 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:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 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:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 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:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 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:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10354,7 +10526,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10362,114 +10534,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:1191
+#: builtin/merge.c:1218
 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:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 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:1225
+#: builtin/merge.c:1252
 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:1227
+#: builtin/merge.c:1254
 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:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 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:1268
+#: builtin/merge.c:1295
 #, 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:1271
+#: builtin/merge.c:1298
 #, 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:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, 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:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Déjà à jour."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Déjà à jour. Ouais !"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, 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:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, 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:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10611,7 +10783,7 @@ msgstr "git mv [<options>] <source>... <destination>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
@@ -10630,68 +10802,68 @@ msgstr "forcer le déplacement/renommage même si la cible existe"
 msgid "skip move/rename errors"
 msgstr "sauter les erreurs de déplacement/renommage"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destination '%s' n'est pas un répertoire"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "impossible de déplacer un répertoire dans lui-même"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
@@ -10884,19 +11056,19 @@ 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:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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 "impossible de résoudre '%s' comme une référence valide."
@@ -10924,47 +11096,47 @@ msgstr "impossible de copier les notes de '%s' vers '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "trop de paramètres"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "pas de note trouvée pour l'objet %s."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "contenu de la note sous forme de chaîne"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "contenu de la note dans un fichier"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "réutiliser et éditer l'objet de note spécifié"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "réutiliser l'objet de note spécifié"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "permettre de stocker une note vide"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "remplacer les notes existantes"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10973,30 +11145,30 @@ msgstr ""
 "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
 "Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Écrasement des notes existantes pour l'objet %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Suppression de la note pour l'objet %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "lire les objets depuis l'entrée standard"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "charger la configuration de réécriture pour <commande> (implique --stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "pas assez de paramètres"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11005,12 +11177,12 @@ msgstr ""
 "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
 "Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11019,52 +11191,52 @@ msgstr ""
 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "échec de la suppression de la copie de travail 'git notes merge'"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "échec de la résolution de NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "impossible de finaliser la fusion de notes"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "stratégie de fusion de notes inconnue %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Options générales"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Options de fusion"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -11072,47 +11244,47 @@ msgstr ""
 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "Validation des notes non fusionnées"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Abandon de la résolution de fusion des notes"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "abandonner la fusion de notes"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "vous devez spécifier une référence de notes à fusionner"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy inconnu : %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "une fusion de notes dans %s est déjà en cours avec %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 "impossible de stocker le lien vers la référence actuelle aux notes (%s)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11123,235 +11295,235 @@ msgstr ""
 "valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
 "avec 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objet %s n'a pas de note\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 "la tentative de suppression d'une note non existante n'est pas une erreur"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "afficher les notes éliminées"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [options...] base-name [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 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:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 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:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 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:2884
+#: builtin/pack-objects.c:2890
 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:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 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:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 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:2899
+#: builtin/pack-objects.c:2905
 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:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 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:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 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:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 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:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 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:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 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:2948
+#: builtin/pack-objects.c:2954
 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:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
@@ -11367,11 +11539,11 @@ msgstr "empaqueter tout"
 msgid "prune loose refs (default)"
 msgstr "éliminer les références perdues (défaut)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "Suppression des objets dupliqués"
 
@@ -11412,7 +11584,7 @@ msgstr "Options relatives à la fusion"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
@@ -11433,7 +11605,7 @@ msgstr "nombre de sous-modules tirés en parallèle"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11441,14 +11613,14 @@ msgstr ""
 "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
 "venez de récupérer."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
 "vous venez de récupérer."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11456,7 +11628,7 @@ msgstr ""
 "Généralement, cela signifie que vous avez indiqué un spécificateur\n"
 "de référence joker qui n'a pas eu de correspondance sur le serveur distant."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11468,44 +11640,44 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Veuillez spécifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branche>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 vous souhaitez indiquer l'information de suivi distant pour cette "
 "branche, vous pouvez le faire avec :"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11515,29 +11687,29 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 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:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11548,7 +11720,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11565,15 +11737,15 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -11972,19 +12144,47 @@ msgstr "déboguer unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase-helper [<options>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "garder les validations vides"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "continuer le rebasage"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "abandonner le rebasage"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "créer les script de rebasage"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "raccourcir les SHA-1 dans la liste à-faire"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "étendre les SHA-1 dans la liste à-faire"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "vérifier la liste à-faire"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "éviter les commandes de picorage non nécessaires"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "réarranger les lignes fixup/squash"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -12014,7 +12214,7 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -12034,11 +12234,11 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Vous devez spécifier un répertoire."
 
@@ -12193,12 +12393,12 @@ msgstr ""
 "spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
 "rapatriement"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe déjà."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' n'est pas un nom valide de distante"
@@ -12223,17 +12423,17 @@ msgstr "(correspond)"
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Distante inconnue : %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12244,17 +12444,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "échec de suppression de '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "échec de création de '%s'"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12269,113 +12469,113 @@ msgstr[1] ""
 "supprimées ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de manière interactive sur la distante %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "créer"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "à jour"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "peut être mis à jour en avance rapide"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "le local n'est pas à jour"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* distante %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
@@ -12383,25 +12583,25 @@ msgstr "(pas d'URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(non demandé)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12409,162 +12609,162 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (état non demandé)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branche locale configurée pour 'git pull' :"
 msgstr[1] "  Branches locales configurées pour 'git pull' :"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Les références locales seront reflétées par 'git push'"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Référence locale configurée pour 'git push'%s :"
 msgstr[1] "  Références locales configurées pour 'git push'%s :"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
 "explicitement avec :"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "être verbeux : doit être placé avant une sous-commande"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sous-commande inconnue : %s"
@@ -12663,7 +12863,7 @@ msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable et -A sont incompatibles"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "échec de la suppression de '%s'"
@@ -12797,123 +12997,123 @@ msgstr "merge"
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, 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:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 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:320
+#: builtin/reset.c:329
 #, 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:328
+#: builtin/reset.c:337
 #, 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:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch est incompatible avec --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 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:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, 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:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N ne peut être utilisé qu'avec --mixed"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, 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:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "garder le `--` passé en argument"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "sortie en forme longue fixée"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13005,11 +13205,11 @@ msgstr "autoriser les validations avec des messages vides"
 msgid "keep redundant, empty commits"
 msgstr "garder les validations redondantes, vides"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "revert a échoué"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "le picorage a échoué"
 
@@ -13079,17 +13279,17 @@ msgstr "autoriser la suppression récursive"
 msgid "exit with a zero status even if nothing matched"
 msgstr "sortir avec un état zéro même si rien ne correspondait"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "pas de suppression récursive de '%s' sans -r"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm : impossible de supprimer %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossible de supprimer '%s'"
@@ -13127,29 +13327,29 @@ msgstr "afficher les messages du greffon de protocole distant"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "Grouper par validateur plutôt que par auteur"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "trier la sortie sur le nombre de validations par auteur"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 "Supprimer les descriptions de validation, fournit seulement le nombre de "
 "validations"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Afficher l'adresse courriel de chaque auteur"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Couper les lignes"
 
@@ -13358,35 +13558,35 @@ 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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossible de supprimer un composant de l'URL '%s'"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, 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:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13395,86 +13595,86 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
 "son propre amont d'autorité."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, 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:410
+#: builtin/submodule--helper.c:404
 #, 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:420
+#: builtin/submodule--helper.c:414
 #, 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:427
+#: builtin/submodule--helper.c:421
 #, 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:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<chemin>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, 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:604
+#: builtin/submodule--helper.c:597
 #, 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:611
+#: builtin/submodule--helper.c:604
 #, 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:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "URL depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13482,83 +13682,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:684
+#: builtin/submodule--helper.c:677
 #, 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:699
+#: builtin/submodule--helper.c:692
 #, 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:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Réessai prévu"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 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:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 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:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 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:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise à jour du paramètre"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13567,20 +13767,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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<chemin>...]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -13593,24 +13793,24 @@ msgstr "git symbolic-ref [<options>] nom [<référence>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "supprimer le message d'erreur pour une référence non symbolique (détachée)"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "supprimer la référence symbolique"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "raccourcir l'affichage de la référence"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "raison"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "raison de la mise à jour"
 
@@ -13640,17 +13840,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nométiquette>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "étiquette '%s' non trouvée."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13663,7 +13863,7 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13678,143 +13878,143 @@ msgstr ""
 "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
 "même si vous le souhaitez.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "impossible de signer l'étiquette"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "impossible d'écrire le fichier d'étiquettes"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, 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:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column et -n sont incompatibles"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "l'option -n est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode liste"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 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:500
+#: builtin/tag.c:483
 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:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "une seule option -F ou -m est autorisée."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "trop de paramètres"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -13890,131 +14090,131 @@ msgstr ""
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "rafraîchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "rafraîchir l'information de stat"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "ajouter l'élément spécifié dans l'index"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "mettre à zéro le bit supposé-non-modifié"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "mettre à zéro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
 "données des objets"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "supprimer les chemins nommés même s'ils sont présents dans la copie de "
 "travail"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "ajouter les éléments depuis l'entrée standard à l'index"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "écrire l'index dans ce format"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "activer ou désactiver l'index divisé"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "activer ou désactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "tester si le système de fichier supporte le cache de non-suivis"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "activer le cache de non-suivis sans tester le système de fichier"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -14022,7 +14222,7 @@ msgstr ""
 "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer l'index coupé"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -14030,7 +14230,7 @@ msgstr ""
 "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver l'index coupé"
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -14038,11 +14238,11 @@ msgstr ""
 "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est désactivé"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -14050,7 +14250,7 @@ msgstr ""
 "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activé pour '%s'"
@@ -14069,19 +14269,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<options>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "lire les mises à jour depuis l'entrée standard"
 
@@ -14145,108 +14345,117 @@ msgstr "git worktree prune [<options>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Suppression de worktrees/%s : répertoire invalide"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, 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:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, 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:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
+"attendus, %<PRIuMAX> octets lus)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, 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:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Préparation de %s (identifiant %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 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:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 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:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
@@ -14271,25 +14480,25 @@ msgstr "seulement utile pour le débogage"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<options>] <répertoire>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 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:1042
 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:1044
 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:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrompre le transfert après <n> secondes d'inactivité"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14302,7 +14511,7 @@ msgstr ""
 "\n"
 "    chmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "afficher les messages de debug sur stderr"
 
@@ -14316,21 +14525,21 @@ 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:337
+#: http.c:338
 #, 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:358
+#: http.c:359
 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:367
+#: http.c:368
 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:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14706,7 +14915,7 @@ msgstr "Impossible de trouver un commit commun avec $pretty_name"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "Déjà à jour avec $pretty_name"
 
 #: git-merge-octopus.sh:89
@@ -14725,53 +14934,55 @@ msgstr "La fusion simple a échoué, essai avec la fusion automatique."
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n"
-"Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n"
-"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
-"rebase --abort\"."
+"Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n"
+"\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n"
+"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour "
+"arrêter\n"
+"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Impossible de revenir à $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "Autoremisage appliqué."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Impossible de stocker $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 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:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 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:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14779,7 +14990,7 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14801,102 +15012,103 @@ msgstr ""
 "chose\n"
 "d'important ici."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "invalide $upstream_name en amont"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, 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:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, 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:506
+#: git-rebase.sh:516
 #, 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:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "fatal : pas de branche : $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autoremisage créé : $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La branche courante $branch_name est à jour."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, 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:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Changements de $mb sur $onto :"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
-"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
+"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
+"dessus..."
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear avec des paramètres n'est pas implémenté"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'état courant de la copie de travail"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "Aucun changement sélectionné"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'état de la copie de travail"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
@@ -14911,7 +15123,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14920,110 +15132,110 @@ msgstr ""
 "erreur: option inconnue pour 'stash save': $option\n"
 "        Pour fournir un message, utilisez git stash save -- '$option'"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'état courant"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 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:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "option inconnue : $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "Aucune entrée de remisage trouvée."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Trop de révisions spécifiées : $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference n'est pas une référence valide"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' n'est pas une validation de type remisage"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' n'est pas une référence de remisage"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Impossible d'appliquer un remisage en cours de fusion"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflits dans l'index. Essayez sans --index."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "Impossible de sauvegarder l'arbre d'index"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 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:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "Impossible de désindexer les fichiers modifiés"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 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:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} supprimé ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Impossible de supprimer l'élément de stash"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Pour les restaurer tapez \"git stash apply\")"
 
@@ -15177,19 +15389,19 @@ msgstr ""
 "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
 "'$displaypath'"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, 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:648
+#: git-submodule.sh:647
 #, 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:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15198,12 +15410,12 @@ msgstr ""
 "Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
 "chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15212,88 +15424,88 @@ 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:684
+#: git-submodule.sh:683
 #, 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:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, 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:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, 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:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, 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:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 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:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode $mod_dst inattendu"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, 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:916
+#: git-submodule.sh:915
 #, 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:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -15312,22 +15524,22 @@ msgstr "Rebasage ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 "\n"
 "Commandes :\n"
-" p, pick = picorer le commit\n"
-" r, reword = picorer le commit, mais reformuler son message\n"
-" e, edit = picorer le commit, mais s'arrêter pour le modifier\n"
-" s, squash = prendre le commit, mais le fusionner avec le précédent\n"
+" p, pick = utiliser le commit\n"
+" r, reword = utiliser le commit, mais reformuler son message\n"
+" e, edit = utiliser le commit, mais s'arrêter pour le modifier\n"
+" s, squash = utiliser le commit, mais le fusionner avec le précédent\n"
 " f, fixup = comme \"squash\", mais en éliminant son message\n"
 " x, exec = lancer la commande (reste de la ligne) dans un shell\n"
 " d, drop = supprimer le commit\n"
@@ -15404,49 +15616,49 @@ msgstr "Impossible de déplacer HEAD sur $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Refus d'écraser un commit de fusion: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Erreur lors de la réapplication de la fusion $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Impossible de picorer $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Ceci est le ${n}ième message de validation :"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Le message de validation ${n} sera ignoré :"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Impossible d'écrire $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Ceci est la combinaison de 2 commits."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Impossible d'appliquer $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15463,31 +15675,31 @@ msgstr ""
 "le\n"
 "problème avant de pouvoir reformuler le message du commit."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Arrêté à $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "'$squash_style' impossible avec le commit précédent"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Exécution : $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'exécution a échoué : $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 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:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15498,7 +15710,7 @@ msgstr ""
 "git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15513,95 +15725,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Commande inconnue : $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Rebasage et mise à jour de $head_name avec succès."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "Impossible de détacher HEAD"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Attention : certains commits ont pu être accidentellement supprimés.\n"
-"Commits supprimés (du plus jeune au plus vieux) :"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
-"commit.\n"
-"\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
-"d'avertissements.\n"
-"Les comportements disponibles sont : ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
-"Ignoré."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15632,12 +15778,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 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:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15645,11 +15791,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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15664,40 +15810,40 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "Impossible de lancer l'éditeur"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Impossible d'extraire $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "Pas de HEAD ?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Impossible de créer un répertoire temporaire $state_dir"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "Impossible de marquer comme interactif"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "Impossible d'initialiser les commits réécrits"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15707,7 +15853,7 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Veuillez noter que les commits vides sont en commentaire"
 
@@ -16304,63 +16450,63 @@ msgstr ""
 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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, 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:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 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:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, 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:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, 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:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16375,12 +16521,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:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16389,7 +16535,7 @@ msgstr ""
 "fatal : %s : %s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16399,17 +16545,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16423,32 +16569,32 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:712
+#: 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:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 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:791
+#: git-send-email.perl:786
 #, 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:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16456,11 +16602,11 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16473,22 +16619,22 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 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:870
+#: git-send-email.perl:865
 #, 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:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -16496,16 +16642,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:944
+#: git-send-email.perl:939
 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:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16532,134 +16678,179 @@ 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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 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:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "echec de STARTTLS ! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 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:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, 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:1534
+#: git-send-email.perl:1549
 #, 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:1582
+#: git-send-email.perl:1597
 #, 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:1605
+#: git-send-email.perl:1622
 #, 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:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, 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:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) n'accepte pas d'argument"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module "
+#~ "'%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "modifier l'information amont"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nom de base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "préfixer le nom de base du projet parent à la sortie"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne "
+#~ "suivante :\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr ""
+#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
+
 #~ msgid "Could not open file '%s'"
 #~ msgstr "impossible d'ouvrir le fichier '%s'"
 
@@ -17087,9 +17278,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
 #~ "amont"
 
-#~ msgid "unable to parse format"
-#~ msgstr "impossible d'analyser le format"
-
 #~ msgid "improper format entered align:%s"
 #~ msgstr "format non convenable align:%s"
 
@@ -17318,9 +17506,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ msgid "no files added"
 #~ msgstr "aucun fichier ajouté"
 
-#~ msgid "force creation (when already exists)"
-#~ msgstr "forcer la création (même si la cible existe)"
-
 #~ msgid "slot"
 #~ msgstr "emplacement"
 
diff --git a/po/git.pot b/po/git.pot
index 4669c5a3c..d4e46e5e7 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: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2017-10-17 09:44+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:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
@@ -96,82 +96,82 @@ msgstr ""
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr ""
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr ""
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr ""
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr ""
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr ""
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr ""
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr ""
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr ""
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr ""
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -182,520 +182,521 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr ""
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr ""
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr ""
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr ""
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr ""
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr ""
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr ""
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr ""
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr ""
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr ""
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr ""
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:4951
+#: apply.c:4977
 msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
-#: apply.c:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr ""
 
-#: apply.c:4960
+#: apply.c:4986
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr ""
 
-#: apply.c:4978
+#: apply.c:5004
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:4981
+#: apply.c:5007
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr ""
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr ""
 
@@ -716,108 +717,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr ""
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr ""
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr ""
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr ""
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr ""
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr ""
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr ""
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr ""
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr ""
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr ""
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr ""
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr ""
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr ""
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr ""
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr ""
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr ""
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr ""
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr ""
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -880,38 +881,38 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr ""
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr ""
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -921,7 +922,7 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -940,10 +941,10 @@ msgstr ""
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr ""
 
@@ -978,42 +979,42 @@ msgstr ""
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Branch '%s' set up to track local branch '%s'."
 msgstr ""
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 
 #: branch.c:119
@@ -1035,21 +1036,21 @@ msgstr ""
 msgid "A branch named '%s' already exists."
 msgstr ""
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr ""
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr ""
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1061,22 +1062,22 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr ""
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr ""
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr ""
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
@@ -1096,7 +1097,9 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr ""
@@ -1105,56 +1108,56 @@ msgstr ""
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:186
+#: bundle.c:193
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr ""
 
-#: bundle.c:195
+#: bundle.c:202
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr ""
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr ""
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr ""
 
@@ -1163,8 +1166,8 @@ msgstr ""
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr ""
@@ -1174,7 +1177,7 @@ msgstr ""
 msgid "%s %s is not a commit!"
 msgstr ""
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1185,152 +1188,152 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr ""
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr ""
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr ""
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr ""
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr ""
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr ""
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr ""
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr ""
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2124
+#: config.c:2169
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
@@ -1347,19 +1350,19 @@ msgid ""
 "and the repository exists."
 msgstr ""
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
@@ -1464,273 +1467,283 @@ msgstr ""
 msgid "Performing inexact rename detection"
 msgstr ""
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr ""
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:4716
+#: diff.c:5505
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 
-#: diff.c:4719
+#: diff.c:5508
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr ""
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr ""
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr ""
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr ""
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr ""
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr ""
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr ""
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr ""
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr ""
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
@@ -1743,7 +1756,7 @@ msgstr ""
 msgid "could not create temporary file"
 msgstr ""
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
@@ -1753,17 +1766,17 @@ msgstr ""
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr ""
@@ -1884,12 +1897,12 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -1901,7 +1914,7 @@ msgid ""
 "remove the file manually to continue."
 msgstr ""
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
@@ -1910,256 +1923,256 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr ""
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr ""
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr ""
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr ""
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr ""
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, 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:1098
+#: merge-recursive.c:1122
 #, 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:1105
+#: merge-recursive.c:1129
 #, 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:1110
+#: merge-recursive.c:1134
 #, 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:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr ""
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr ""
 
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr ""
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr ""
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr ""
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr ""
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr ""
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr ""
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr ""
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2167,7 +2180,7 @@ msgid ""
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
@@ -2195,16 +2208,30 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
 #: parse-options.c:573
 msgid "..."
 msgstr ""
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -2212,17 +2239,17 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr ""
 
@@ -2231,7 +2258,7 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr ""
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
@@ -2302,18 +2329,18 @@ msgstr ""
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: pathspec.c:575
+#: 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 ""
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr ""
 
@@ -2331,48 +2358,49 @@ msgid ""
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr ""
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
 #, c-format
-msgid "could not delete reference %s: %s"
+msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
-msgid "could not delete references: %s"
+msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
-msgid "could not remove reference %s"
+msgid "could not delete references: %s"
 msgstr ""
 
 #: ref-filter.c:35 wt-status.c:1811
@@ -2404,147 +2432,147 @@ msgstr ""
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
+msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr ""
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr ""
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
@@ -2552,7 +2580,7 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
@@ -2560,108 +2588,108 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr ""
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: remote.c:747
+#: remote.c:750
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr ""
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1698
+#: remote.c:1699
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1713
+#: remote.c:1714
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
@@ -2676,7 +2704,7 @@ msgstr ""
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
 #: remote.c:2087
@@ -2717,16 +2745,16 @@ msgstr[1] ""
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
@@ -2766,72 +2794,73 @@ msgstr ""
 msgid "the receiving end does not support push options"
 msgstr ""
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr ""
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr ""
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr ""
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr ""
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:282
+#: sequencer.c:284
 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:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr ""
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr ""
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
@@ -2839,20 +2868,20 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr ""
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr ""
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2869,17 +2898,17 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr ""
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr ""
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -2887,7 +2916,7 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -2895,229 +2924,230 @@ msgid ""
 "\t%.*s"
 msgstr ""
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr ""
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr ""
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr ""
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3127,11 +3157,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3142,17 +3172,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3160,81 +3190,156 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr ""
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 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:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr ""
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr ""
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr ""
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr ""
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3258,96 +3363,82 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr ""
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr ""
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "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:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr ""
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3360,81 +3451,86 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr ""
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr ""
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr ""
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3442,101 +3538,105 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr ""
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr ""
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr ""
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr ""
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 ""
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr ""
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr ""
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr ""
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr ""
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr ""
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr ""
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr ""
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr ""
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3552,7 +3652,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr ""
 
@@ -3573,102 +3673,102 @@ msgstr ""
 msgid "empty filename in tree entry"
 msgstr ""
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, 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:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, 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:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, 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:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, 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:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, 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:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, 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:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3676,7 +3776,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3684,47 +3784,47 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, 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:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, 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:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -3732,7 +3832,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -3740,24 +3840,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr ""
 
@@ -3800,13 +3895,8 @@ msgstr ""
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr ""
@@ -3830,191 +3920,191 @@ msgstr ""
 msgid "could not close %s"
 msgstr ""
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr ""
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr ""
 
-#: wt-status.c:222
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:224
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:225
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
-#: wt-status.c:227
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
-#: wt-status.c:239
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr ""
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr ""
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr ""
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr ""
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr ""
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr ""
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr ""
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr ""
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr ""
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr ""
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr ""
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr ""
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr ""
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr ""
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr ""
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr ""
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr ""
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
@@ -4291,7 +4381,7 @@ msgstr ""
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -4305,7 +4395,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr ""
 
@@ -4314,108 +4404,108 @@ msgstr ""
 msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr ""
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr ""
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr ""
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4433,185 +4523,185 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr ""
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr ""
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr ""
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1172
+#: builtin/am.c:1194
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr ""
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr ""
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr ""
 
@@ -4619,42 +4709,42 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr ""
 
-#: builtin/am.c:1915
+#: builtin/am.c:1913
 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:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -4662,172 +4752,171 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr ""
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr ""
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr ""
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
@@ -5029,124 +5118,149 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 
 #: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr ""
 
 #: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr ""
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr ""
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5154,225 +5268,224 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: builtin/branch.c:585
+msgid "do not use"
 msgstr ""
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr ""
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr ""
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr ""
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr ""
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr ""
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr ""
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr ""
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr ""
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr ""
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
 msgstr ""
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
 msgstr ""
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
 msgstr ""
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
 
 #: builtin/bundle.c:45
@@ -5388,75 +5501,75 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
 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:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr ""
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr ""
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr ""
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
@@ -5484,7 +5597,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -5574,9 +5687,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr ""
 
@@ -5647,54 +5760,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -5709,7 +5822,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5726,160 +5839,160 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr ""
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr ""
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr ""
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr ""
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -5915,7 +6028,7 @@ msgstr ""
 msgid "failed to remove %s"
 msgstr ""
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5924,7 +6037,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5937,38 +6050,38 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr ""
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -5979,386 +6092,386 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr ""
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr ""
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr ""
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr ""
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr ""
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr ""
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr ""
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr ""
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr ""
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr ""
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr ""
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr ""
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr ""
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr ""
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr ""
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr ""
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr ""
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr ""
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr ""
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr ""
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr ""
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr ""
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr ""
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr ""
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr ""
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr ""
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr ""
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr ""
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr ""
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr ""
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr ""
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 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:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr ""
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -6461,98 +6574,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -6562,7 +6675,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6572,14 +6685,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, 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:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6587,341 +6700,342 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr ""
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr ""
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr ""
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr ""
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr ""
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr ""
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr ""
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr ""
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr ""
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr ""
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr ""
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1747
+#: builtin/commit.c:1756
 #, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1761
 #, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7078,23 +7192,23 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr ""
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr ""
 
@@ -7118,141 +7232,141 @@ msgstr ""
 msgid "annotated"
 msgstr ""
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr ""
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr ""
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr ""
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr ""
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr ""
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr ""
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr ""
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr ""
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr ""
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr ""
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
@@ -7266,21 +7380,21 @@ msgstr ""
 msgid "invalid option: %s"
 msgstr ""
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr ""
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
@@ -7289,97 +7403,97 @@ msgstr ""
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr ""
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr ""
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr ""
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr ""
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr ""
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr ""
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr ""
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr ""
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
@@ -7387,325 +7501,325 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr ""
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr ""
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr ""
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr ""
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr ""
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr ""
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr ""
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr ""
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr ""
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr ""
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr ""
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr ""
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr ""
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr ""
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr ""
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr ""
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, 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:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr ""
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr ""
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
@@ -7714,23 +7828,23 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr ""
 
@@ -7770,101 +7884,105 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr ""
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr ""
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr ""
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr ""
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr ""
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -7874,49 +7992,49 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr ""
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr ""
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr ""
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
-#: builtin/gc.c:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
-#: builtin/gc.c:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -7925,12 +8043,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
@@ -7939,249 +8057,241 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr ""
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr ""
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr ""
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr ""
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr ""
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr ""
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr ""
 
@@ -8270,370 +8380,370 @@ msgstr ""
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr ""
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr ""
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr ""
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr ""
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr ""
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr ""
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr ""
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "'%s' is aliased to '%s'"
 msgstr ""
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr ""
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr ""
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr ""
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 msgid "pack too large for current definition of off_t"
 msgstr ""
 
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr ""
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr ""
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr ""
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr ""
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr ""
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr ""
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr ""
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr ""
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr ""
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr ""
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr ""
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr ""
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr ""
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr ""
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr ""
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr ""
 
@@ -8759,452 +8869,492 @@ msgid ""
 "<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr ""
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr ""
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr ""
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr ""
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr ""
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr ""
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr ""
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr ""
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr ""
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr ""
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 
-#: builtin/log.c:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr ""
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr ""
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr ""
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr ""
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr ""
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr ""
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr ""
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr ""
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr ""
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr ""
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr ""
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr ""
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr ""
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr ""
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr ""
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr ""
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr ""
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr ""
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr ""
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr ""
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr ""
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr ""
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr ""
 
@@ -9292,176 +9442,180 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr ""
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr ""
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9471,185 +9625,185 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr ""
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr ""
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -9788,7 +9942,7 @@ msgstr ""
 msgid "Directory %s is in index and no submodule?"
 msgstr ""
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
@@ -9805,68 +9959,68 @@ msgstr ""
 msgid "skip move/rename errors"
 msgstr ""
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr ""
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr ""
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr ""
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr ""
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr ""
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr ""
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr ""
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr ""
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr ""
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
@@ -10051,19 +10205,19 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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 ""
@@ -10091,185 +10245,185 @@ msgstr ""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 ""
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr ""
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr ""
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr ""
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr ""
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr ""
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr ""
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr ""
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr ""
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr ""
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr ""
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr ""
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr ""
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr ""
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr ""
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr ""
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10277,218 +10431,218 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr ""
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr ""
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr ""
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr ""
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr ""
 
@@ -10504,11 +10658,11 @@ msgstr ""
 msgid "prune loose refs (default)"
 msgstr ""
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr ""
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr ""
 
@@ -10549,7 +10703,7 @@ msgstr ""
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr ""
 
@@ -10570,24 +10724,24 @@ msgstr ""
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -10595,69 +10749,69 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr ""
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr ""
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr ""
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr ""
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 ""
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -10665,7 +10819,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -10676,15 +10830,15 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -11006,19 +11160,47 @@ msgstr ""
 msgid "git rebase--helper [<options>]"
 msgstr ""
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr ""
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr ""
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr ""
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr ""
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11035,7 +11217,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -11047,11 +11229,11 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr ""
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr ""
 
@@ -11196,12 +11378,12 @@ msgstr ""
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr ""
@@ -11224,17 +11406,17 @@ msgstr ""
 msgid "(delete)"
 msgstr ""
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr ""
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11242,17 +11424,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11262,113 +11444,113 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr ""
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr ""
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr ""
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr ""
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr ""
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr ""
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr ""
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr ""
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr ""
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr ""
 
@@ -11376,184 +11558,184 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr ""
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr ""
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr ""
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr ""
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr ""
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr ""
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr ""
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr ""
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr ""
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr ""
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr ""
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
@@ -11648,7 +11830,7 @@ msgstr ""
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
@@ -11778,119 +11960,119 @@ msgstr ""
 msgid "keep"
 msgstr ""
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr ""
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr ""
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr ""
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr ""
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr ""
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr ""
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr ""
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11976,11 +12158,11 @@ msgstr ""
 msgid "keep redundant, empty commits"
 msgstr ""
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr ""
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr ""
 
@@ -12042,17 +12224,17 @@ msgstr ""
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
@@ -12085,27 +12267,27 @@ msgstr ""
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr ""
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr ""
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr ""
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr ""
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr ""
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr ""
 
@@ -12297,215 +12479,215 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, 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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -12518,23 +12700,23 @@ msgstr ""
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr ""
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr ""
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr ""
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr ""
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr ""
 
@@ -12559,17 +12741,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr ""
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -12578,7 +12760,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -12588,142 +12770,142 @@ msgid ""
 "want to.\n"
 msgstr ""
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr ""
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr ""
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr ""
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr ""
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr ""
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr ""
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr ""
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr ""
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr ""
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr ""
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr ""
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr ""
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr ""
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr ""
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr ""
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr ""
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr ""
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr ""
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr ""
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr ""
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
@@ -12790,155 +12972,155 @@ msgstr ""
 msgid " OK"
 msgstr ""
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr ""
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr ""
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr ""
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr ""
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr ""
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr ""
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr ""
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr ""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr ""
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr ""
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr ""
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr ""
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr ""
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr ""
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr ""
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr ""
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr ""
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr ""
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
@@ -12955,19 +13137,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr ""
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr ""
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr ""
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr ""
 
@@ -13031,102 +13213,109 @@ msgstr ""
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr ""
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr ""
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
@@ -13151,23 +13340,23 @@ msgstr ""
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr ""
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr ""
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13176,7 +13365,7 @@ msgid ""
 "\tchmod 0700 %s"
 msgstr ""
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr ""
 
@@ -13187,20 +13376,20 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr ""
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: http.c:367
+#: http.c:368
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13544,7 +13733,7 @@ msgstr ""
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr ""
 
 #: git-merge-octopus.sh:89
@@ -13563,53 +13752,54 @@ msgstr ""
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr ""
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr ""
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr ""
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr ""
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: git-rebase.sh:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -13622,101 +13812,101 @@ msgid ""
 "valuable there."
 msgstr ""
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr ""
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr ""
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr ""
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr ""
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
-#: git-rebase.sh:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr ""
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr ""
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr ""
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr ""
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
@@ -13731,114 +13921,114 @@ msgstr ""
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
 "       To provide a message, use git stash save -- '$option'"
 msgstr ""
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr ""
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr ""
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr ""
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr ""
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr ""
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr ""
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr ""
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr ""
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr ""
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
@@ -13969,110 +14159,110 @@ msgstr ""
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""
@@ -14091,13 +14281,13 @@ msgstr ""
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -14160,49 +14350,49 @@ msgstr ""
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr ""
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14212,31 +14402,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 msgid "and made changes to the index and/or the working tree"
 msgstr ""
 
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -14244,7 +14434,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -14254,79 +14444,29 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr ""
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -14344,21 +14484,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr ""
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14367,47 +14507,47 @@ msgid ""
 "\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr ""
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr ""
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr ""
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr ""
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr ""
 
@@ -14914,60 +15054,60 @@ msgstr ""
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
-#: git-send-email.perl:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -14977,36 +15117,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15015,41 +15155,41 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-send-email.perl:750
+#: git-send-email.perl:745
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr ""
 
-#: git-send-email.perl:759
+#: git-send-email.perl:754
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-send-email.perl:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15058,20 +15198,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
@@ -15079,16 +15219,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15105,128 +15245,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:1335
+#: git-send-email.perl:1350
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr ""
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr ""
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr ""
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 6c7d896a8..1c7db2fec 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -58,8 +58,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-01 12:26+0900\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-17 16:23+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
 "ko>\n"
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "해결하지 못한 충� 때문� �납니다."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "병합 작업� 다 마치지 않았습니다 (MERGE_HEAD 파�� 있습니다)."
 
@@ -160,86 +160,86 @@ msgstr "알 수 없는 공백 옵션 '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "알 수 없는 공백 무시 옵션 '%s'"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject � --3way 옵션� 같� 쓸 수 없습니다."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached � --3way 옵션� 같� 쓸 수 없습니다."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "저장소 밖�서 --3way 옵션 사용"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "저장소 밖�서 --index 옵션 사용"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "저장소 밖�서 --cached 옵션 사용"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "타임스탬프 정규�� 준비할 수 없습니다 (%s)"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec()�서 다� 입력� 대해 %d번� 리턴했습니다: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "패치� %d번 줄� 파� �름� 찾� 수 없습니다"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %2$d번 줄�서 /dev/null� 기대했지만, '%1$s'�"
 "(가) 왔습니다"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %d번 줄� 새 파� �름� 올바르지 않습니다"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: 잘못� git-diff - %d번 줄� 예전 파� �름� 올바르지 않습니다"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: 잘못� git-diff - %d번 줄�서 /dev/null� 기대했습니다"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "%d번 줄� 잘못� 모드: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "�관성 없는 헤� 줄 %d번 � %d번"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: 예�치 못한 줄: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "%d번 줄� 헤� 없는 패치 부분: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -251,81 +251,81 @@ msgstr[0] ""
 "경로 �름 부분�서 %d개를 제거� 때 git diff 헤�� 파� �름 정보가 없습니"
 "다. (%d번 줄)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 헤�� 파� �름 정보가 없습니다 (%d번 줄)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "새 파�� 예전 내용� �존합니다"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "삭제한 파�� 아� 내용� 들어 있습니다"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "패치가 %d번 줄�서 �가졌습니다"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "새 파� %s�(가) 예전 내용� �존합니다"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "삭제한 파� %s�(가) 아� 내용� 들어 있습니다"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 경고: %s 파�� 내용� 비어 있지만 삭제�지 않았습니다"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "%d번 줄� 바�너리 패치가 ���었습니다: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "%d번 줄� 바�너리 패치가 �해할 수 없습니다"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "%d번 줄� 쓰레기 ��터만 있는 패치"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "%s 심볼릭 ��를 �� 수 없습니다"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "%s�(를) 열거나 �� 수 없습니다"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "줄 시작� 잘못�: '%c'"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "패치 %d번 부분 %d번 줄�서 성공 (오프셋 %d번 줄)"
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "컨�스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄�서 �용)"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -334,438 +334,439 @@ msgstr ""
 "다�� 검색하� 중:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "'%s'� 대한 바�너리 패치 ��터가 없습니다"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "반대 ��가 없으면 '%s'� 대한 바�너리 패치를 반대로 �용할 수 없습니다"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "전체 ��스 ��� 없으면 '%s'� 대한 바�너리 패치를 �용할 수 없습니다"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "패치가 '%s'(%s)� �용�지만, 현재 내용과 �치하지 않습니다."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "패치는 빈 '%s'� �용�지만, 현재 비어 있지 않습니다"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "'%2$s'� 대한 필요한 %1$s �스트�미지를 �� 수 없습니다"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "바�너리 패치를 '%s'� �용할 수 없습니다"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "'%s'� 대한 바�너리 패치가 올바르지 않� 결과를 만듭니다. (기대한 값 %s, 실"
 "제 %s)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "패치 실패: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "%s�(를) 가져올 수 없습니다"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "%s�(를) �는� 실패했습니다"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "심볼릭 �� 뒤� 있는 '%s' �기"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "%s 경로가 �름� 바뀌었거나 삭제�었습니다"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: ��스� 없습니다"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: ��스와 맞지 않습니다"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "저장소� 3-방향 병합으로 대신할 때 필요한 블롭� 없습니다."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "3-방향 병합으로 대신합니다...\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "'%s'� 현재 내용� �� 수 없습니다"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "3-방향 병합으로 대신하는� 실패했습니다...\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "패치를 '%s'� 충�� 있는 �태로 �용.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "패치를 '%s'� 패치 문제 없� �용.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "제거하는 패치 다�� 파� 내용� 남았습니다"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: 잘못� 종류"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s� 종류가 %o�지만 %o�(가) �어야 합니다"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "잘못� 경로 '%s'"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: �미 ��스� 있습니다"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: �미 작업 디렉터리� 있습니다"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s� 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s� 새 모드(%1$o)가 %4$s� 예전 모드(%3$o)와 다릅니다"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�향 받는 '%s' 파�� 심볼릭 �� 뒤� 있습니다"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: 패치를 �용하지 않습니다"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "%s 패치를 확�하는 중입니다..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "sha1 정보가 없거나 %s 하위 모듈�서 쓸 수 없습니다"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s� 대한 모드 변경�지만, 현재 HEAD� 없습니다"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "경로 '%s'� 대해 make_cache_entry 실패"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "임시 ��스� %s 항목� 추가할 수 없습니다"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "임시 ��스를 %s� 쓸 수 없습니다"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "��스�서 %s�(를) 제거할 수 없습니다"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "하위 모듈 %s� 대해 ��� 패치"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "새로 만든 파� '%s'� 대해 stat()할 수 없습니다"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "새로 만든 파� '%s'� 대해 예비 저장소를 만들 수 없습니다"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "%s� 대해 �시 항목� 추가할 수 없습니다"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "'%s'� 쓰는� 실패했습니다"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "'%s' 파�� 닫는 중입니다"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "'%s' 파�� 쓸 수 없습니다 ('%o' 모드)"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "%s 패치 깔�하게 �용."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "내부 오류"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "%%s 패치를 (%d개 거부) �용..."
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncating .rej 파� �름� '%.*s.rej'(으)로 �름"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "%s�(를) 열 수 없습니다"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "패치 부위 #%d 깔�하게 �용."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "패치 부위 #%d 거부�."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "패치 '%s' 건너뜀."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "��할 수 없는 입력"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "��스 파�� �� 수 없습니다"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "'%s' 패치를 열 수 없습니다: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "공백 오류 %d개를 넘어갑니다"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d번 줄�서 공백 오류를 추가합니다."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "공백 오류를 바로잡� 뒤� %d번 줄 �용."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "경로"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "주어진 경로� 해당하는 변경 사항� �용하지 않습니다"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "주어진 경로� 해당하는 변경 사항� �용합니다"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "개수"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "전통�� diff 경로 앞� <개수>개� 앞 슬래시(/)를 제거합니다"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "패치�서 추가하는 파�� 무시합니다"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "패치를 �용하는 대신, 입력� 대한 diffstat� 출력합니다"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "십진수로 추가 � 삭제한 줄 수를 표시합니다"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "패치를 �용하는 대신, 입력� 대한 요약� 출력합니다"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "패치를 �용하는 대신, 패치를 �용 가능한지 확�합니다"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "현재 ��스�서 패치가 �용 가능한지 확�합니다"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "작업 ��를 바꾸지 않고 패치를 �용합니다"
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr "작업 �역 밖� 파�� 바꾸는 패치를 허용합니다"
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "그리고 패치� �용합니다 (--stat/--summary/--check 옵션과 같� 사용)"
 
-#: apply.c:4951
+#: apply.c:4977
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "패치를 �용하지 않으면 3-방향 병합� 시�합니다"
 
-#: apply.c:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr "내장 ��스 정보를 사용해 임시 ��스를 만듭니다"
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "경로를 NUL 문�로 구분합니다"
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr "최소한 <n>줄� 컨�스트와 �치하는지 확�합니다"
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "�작"
 
-#: apply.c:4960
+#: apply.c:4986
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "공백 오류가 있는 추가�거나 수정� 줄� 찾습니다"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "컨�스트를 찾� 때 공백 변경 사항� 무시합니다"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "패치를 반대 순서로 �용합니다"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "최소한� 컨�스트 한 줄� 없� �용합니다"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "거부� 패치 부분� 대��는 *.rej 파�� 남겨둡니다"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "패치 부분� 겹�� 허용합니다"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "�세히 표시"
 
-#: apply.c:4978
+#: apply.c:5004
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "파� �� 줄바꿈� 빠졌�� 잘못 검색한 경우� 무시합니다"
 
-#: apply.c:4981
+#: apply.c:5007
 msgid "do not trust the line counts in the hunk headers"
 msgstr "패치 부분� 헤�� 줄 수를 신용하지 않습니다"
 
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "최�위"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "모든 파� �름� <최�위>를 앞� 붙입니다"
 
@@ -788,108 +789,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <저장소> [--exec <명령>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "'%s' 경로명세가 어떤 파�과� �치하지 않습니다"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "형�"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "압축 형�"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "접�어"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "아카�브� � 경로 �름� 앞� 지정한 경로를 붙입니다"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "파�"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "아카�브를 � 파�� �니다"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "작업 ��� .gitattributes를 �습니다"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "아카�브� �함� 파�� 표준오류로 표시합니다"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "저장만 하기"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "� 빠르게 압축"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "� 작게 압축"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "지�하는 압축 형�� 목�� 표시합니다"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "저장소"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "�격 저장소 <저장소>�서 아카�브를 가져옵니다"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "명령"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "�격 git-upload-archive 명령� 경로"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "예�치 못한 옵션 --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "--exec 옵션� --remote 옵션과 같� 사용할 경우�만 쓸 수 있습니다."
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "예�치 못한 옵션 --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "알 수 없는 아카�브 형� '%s'"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "'%s' 형��서는 지�하지 않는 ��: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s�(는) 올바른 �성 �름� 아닙니다"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -966,31 +967,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "�등분: 병합 베�스를 시험해야 합니다\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "하나� %s 리비전� 필요합니다"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "'%s' 파�� 만들 수 없습니다"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "'%s' 파�� �� 수 없습니다"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "�등분 레�런스 �기� 실패했습니다"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s�(는) %s � %s 모�� 해당�니다\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -999,7 +1000,7 @@ msgstr ""
 "시험 가능한 커밋� 없습니다.\n"
 "잘못�니 경로 파�미터로 시작하지 않았습니까?\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1008,7 +1009,7 @@ msgstr[0] "(대략 %d 단계)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1027,10 +1028,10 @@ msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse � --first-parent 옵션� 같� 쓰면 최근 커밋� 지정해야 합니다"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "리비전 walk 준비가 실패했습니다"
 
@@ -1071,48 +1072,43 @@ msgstr "%s 브랜치를 �신� 업스트림으로 지정하지 않�."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베�스를 통해 리모트� %s 브랜치를 (%s�서) 따�가�� 설정�었"
-"습니다."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베�스를 통해 리모트� '%s' 브랜치를 ('%s'�서) 따�가�� 설정�었습니다."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "%s 브랜치가 리모트� %s 브랜치를 (%s�서) 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "'%s' 브랜치가 리모트� '%s' 브랜치를 ('%s'�서) 따�가�� 설정�었습니다."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베�스를 통해 리모트� %s 브랜치를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베�스를 통해 리모트� '%s' 브랜치를 따�가�� 설정�었습니다."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "%s 브랜치가 %s 브랜치를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "'%s' 브랜치가 '%s' 브랜치를 따�가�� 설정�었습니다."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베�스를 통해 리모트� %s 레�런스를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베�스를 통해 리모트� '%s' 레�런스를 따�가�� 설정�었습니다."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "%s 브랜치가 리모트� %s 레�런스를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "'%s' 브랜치가 리모트� '%s' 레�런스를 따�가�� 설정�었습니다."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"%s 브랜치가 리베�스를 통해 로컬� %s 레�런스를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "'%s' 브랜치가 리베�스를 통해 로컬� '%s' 레�런스를 따�가�� 설정�었습니다."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "%s 브랜치가 로컬� %s 레�런스를 따�가�� 설정�었습니다."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "'%s' 브랜치가 로컬� '%s' 레�런스를 따�가�� 설정�었습니다."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1133,22 +1129,22 @@ msgstr "'%s'�(는) 올바른 브랜치 �름� 아닙니다."
 msgid "A branch named '%s' already exists."
 msgstr "�름� '%s'� 브랜치가 �미 있습니다."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "현재 브랜치를 강제로 업��트할 수 없습니다."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "따�가기 정보를 설정할 수 없습니다. 시작 위치 '%s'�(가) 브랜치가 아닙니다."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1166,22 +1162,22 @@ msgstr ""
 "새 로컬 브랜치를 거기� 해당하는 리모트 브랜치로 push하려면,\n"
 "\"git push -u\"로 push하는 업스트림� 설정할 수 있습니다."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "올바른 오브�트 �름� 아닙니다: '%s'."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "애매한 오브�트 �름: '%s'."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s'�(는) �미 '%s' 위치� 받아져 있습니다"
@@ -1201,7 +1197,9 @@ msgstr "'%s' 파�� 버전2 번들 파�로 보�지 않습니다"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "��할 수 없는 헤�: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
@@ -1210,54 +1208,54 @@ msgstr "'%s'�(를) 열 수 없습니다"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "저장소� 필수�� 다� 커밋� 없습니다:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "번들� 다� 레�런스 %d개가 있습니다:"
 
-#: bundle.c:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "번들� 전체 커밋 내역� 기�합니다."
 
-#: bundle.c:195
+#: bundle.c:202
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "번들� 다� 레�런스 %d개가 필요합니다:"
 
-#: bundle.c:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "pack-objects 명령� 실행할 수 없습니다"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "pack-objects 명령� 죽었습니다"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "rev-list 명령� 죽었습니다"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "rev-list 옵션�서 '%s' 레�런스가 제외�었습니다"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "알 수 없는 ��: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "빈 번들� 만들지 않습니다."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "'%s'�(를) 만들 수 없습니다"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "index-pack 명령� 죽었습니다"
 
@@ -1266,8 +1264,8 @@ msgstr "index-pack 명령� 죽었습니다"
 msgid "invalid color value: %.*s"
 msgstr "잘못� 색 값: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "parse %s�(를) 파싱할 수 없습니다"
@@ -1277,7 +1275,7 @@ msgstr "parse %s�(를) 파싱할 수 없습니다"
 msgid "%s %s is not a commit!"
 msgstr "%s %s, 커밋� 아닙니다"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1291,152 +1289,152 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "메모리 바닥남"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "�대 경로 설정 include 조건� 파��서 와야 합니다"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "블롭 %2$s 안� %1$d번 줄� 잘못� 설정"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "파� %2$s 안� %1$d번 줄� 잘못� 설정"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "표준 입력 안� %d번 줄� 잘못� 설정"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "하위 모듈 블롭 %2$s 안� %1$d번 줄� 잘못� 설정"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "명령행 %2$s 안� %1$d번 줄� 잘못� 설정"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "%2$s 안� %1$d번 줄� 잘못� 설정"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "범위를 벗어남"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "단위가 잘못�"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s'): %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', 블롭 %s): %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', 파� %s): %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', 표준입력): %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', 하위 모듈 블롭 %s): %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', 명령행 %s): %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "잘못� 수치 설정 값 '%s' (키 '%s', %s 안�): %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "다�� 사용� 디렉터리 확장� 실패: '%s'"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "%d번� 올바른 zlib 압축 단계가 아닙니다"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "오브�트 �성 모드가 올바르지 않습니다: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "잘못 묶� 압축 단계 %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "명령행 설정� 파싱할 수 없습니다"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "설정 파�� �는 중 알 수 없는 오류가 �겼습니다"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "잘못� %s: '%s'"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "알 수 없는 core.untrackedCache 값 '%s'; 기본값으로 'keep' 사용"
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 값('%d')� 0�서 100 사�여야 합니다"
 
-#: config.c:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "명령행 설정�서 '%s'�(를) 설정할 수 없습니다"
 
-#: config.c:2124
+#: config.c:2169
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "'%2$s' 파�� %3$d번 줄 '%1$s' 설정 변수가 잘못�었습니다"
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s�(는) 여러 개 값� 있습니다"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "%s� 대해 fstat 실패"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "'%s'�(를) '%s'(으)로 설정할 수 없습니다"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "'%s' 설정� 지울 수 없습니다"
@@ -1457,19 +1455,19 @@ msgstr ""
 "올바른 접근 권한� 있는지, 그리고 저장소가 있는지\n"
 "확�하십시오."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "연결� 확�하는 중입니다"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "'git rev-list'를 실행할 수 없습니다"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "rev-list 쓰기� 실패했습니다"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "rev-list� 표준입력� 닫는� 실패했습니다"
 
@@ -1569,27 +1567,33 @@ msgstr "'%s' 순서 파�� �는� 실패했습니다"
 msgid "Performing inexact rename detection"
 msgstr "부정확한 �름 바꾸기 �색� 수행하는 중"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "'%s' 옵션�는 값� 필요합니다"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  dirstat �름 �센트 값 '%s' 파싱� 실패했습니다\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  알 수 없는 dirstat 파�미터 '%s'\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr "옮김 색 설정� 'no', 'default', 'zebra', 'dimmed_zebra', 'plain' 중� 하나입니다."
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "'diff.submodule' 설정 변수� 알 수 없는 값: '%s'"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1598,21 +1602,21 @@ msgstr ""
 "'diff.submodule' 설정 변수� 오류:\n"
 "%s'"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "외부 diff 프로그램� 죽�, %s 위치�서 멈춤"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 옵션�는 정확히 하나� 경로명세가 필요합니다"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1621,226 +1625,230 @@ msgstr ""
 "--dirstat/-X 옵션 파�미터를 파싱하는� 실패했습니다:\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "--submodule 옵션 파�미터 파싱� 실패했습니다: '%s'"
 
-#: diff.c:4716
+#: diff.c:5505
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "파�� 너무 많아서 부정확한 �름 바꾸기 검색 기능� 건너�니다."
 
-#: diff.c:4719
+#: diff.c:5508
 msgid "only found copies from modified paths due to too many files."
 msgstr "파�� 너무 많아서 수정한 경로� 복사본만 찾았습니다."
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령� 다시 시�해 보십시오."
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "커� �름과 정보를 가져오는� 실패했습니다"
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr "� 시스템 �는 위치�서는 추��지 않는 �시를 사용하지 않습니다."
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "%s� 필요한 디렉터리를 만들 수 없습니다"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 git 디렉터리를 옮겨올 수 없습니다"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "내용 필터�"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "'%s' 파�� stat� 할 수 없습니다"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: 얕� 목�� 예�함"
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "리모트 오류: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'�(를) 받았습니다"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 옵션� multi_ack_detailed가 필요합니다"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "shallow 줄� 잘못�: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "unshallow 줄� 잘못�: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "오브�트가 없습니다: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "오브�트� 오류: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "shallow가 없습니다: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow가 와야 하지만, %s�(를) 받았습니다"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "받�: %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "잘못� 커밋 %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "�기함"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "완료"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "받�: %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "%s 항목� 완료로 표시"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "�미 %s (%s) 있�"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: 사�드밴드 디멀티플렉서를 fork할 수 없습니다"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "프로토콜 오류: 잘못� 묶� 헤�"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: %s 명령� fork할 수 없습니다"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s 실패"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "사�드밴드 디멀티플렉서� 오류"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "서버�서 shallow ���언트를 지�하지 않습니다"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "서버�서 multi_ack_detailed를 지�합니다"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "서버�서 no-done� 지�합니다"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "서버�서 multi_ack를 지�합니다"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "서버�서 side-band-64k를 지�합니다"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "서버�서 side-band를 지�합니다"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "서버�서 allow-tip-sha1-in-want를 지�합니다"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "서버�서 allow-reachable-sha1-in-want를 지�합니다"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "서버�서 ofs-delta를 지�합니다"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "서버 버전� %.*s입니다"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "서버�서 --shallow-signed 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "서버�서 --shallow-exclude 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "서버�서 --deepen 옵션� 지�하지 않습니다"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "공통 커밋 없�"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: 가져오기 실패."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "해당하는 리모트 헤드가 없습니다"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "그런 리모트가 레�런스가 없습니다: %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "서버�서 알려지지 않� %s 오브�트� 대한 요청� 허용하지 않습니다"
@@ -1853,7 +1861,7 @@ msgstr "gpg�서 ��터를 서명하는� 실패했습니다."
 msgid "could not create temporary file"
 msgstr "임시 파�� 만들 수 없습니다"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "분리� 서명� '%s'� 쓰는� 실패했습니다"
@@ -1863,17 +1871,17 @@ msgstr "분리� 서명� '%s'� 쓰는� 실패했습니다"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "log.graphColors� 잘못� 색� ('%.*s') 무시합니다"
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': %s�(를) �� 수 없습니다"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "'%s'� 대해 stat()� 실패했습니다"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': �다가 잘림"
@@ -2009,12 +2017,12 @@ msgstr "빈 ì�´ë¦„ì�˜ ì‹ ì›� 정보는 (<%s>ì—� 대해) 허용하지 않습니ë‹
 msgid "name consists only of disallowed characters: %s"
 msgstr "�름� 허용하지 않는 문�로만 �루어져 있습니다: %s"
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "시� 형�� 잘못�었습니다: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2033,7 +2041,7 @@ msgstr ""
 "저장소�서 깃 프로세스가 전� �� 종료했� 수� 있습니다:\n"
 "수�으로 해당 파�� 제거하고 계�하십시오."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "'%s.lock'� 만들 수 없습니다: %s"
@@ -2042,78 +2050,78 @@ msgstr "'%s.lock'� 만들 수 없습니다: %s"
 msgid "failed to read the cache"
 msgstr "�시를 �는� 실패했습니다"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "새 ��스 파�� 쓸 수 없습니다"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(잘못� 커밋)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "'%s' 경로� 대해 addinfo_cache가 실패했습니다"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "트리 빌드� 오류"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "'%s' 경로 만들기� 실패했습니다%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "하위 디렉터리� 공간� 만드려고 %s�(를) 제거합니다\n"
 
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": 아마� D/F 충�?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "'%s' 위치� 추��지 않는 파�� 잃기를 거부합니다"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "%s '%s' 오브�트를 �� 수 없�"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s'� 대해 블롭� 예�"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "'%s'�(를) 여는� 실패: %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "'%s' 심볼릭 ��� 실패: %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "다�� 어떻게 할지 알 수 없습니다: %06o %s '%s'"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "내부 병합 실행� 실패"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "%s�(를) ��터베�스� 추가할 수 없습니다"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2121,7 +2129,7 @@ msgid ""
 msgstr ""
 "충�! (%s/삭제): %s (위치 %s) � %s (%s�서) 삭제. %s 버전� %s 트리� 남�."
 
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2130,7 +2138,7 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) 삭제, %s�서 %s(으)로 (위치 %s). %s 버전� %s "
 "트리� 남�."
 
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2139,7 +2147,7 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) � %s (위치 %s) 삭제. %s 버전� %s 트리� "
 "%s(으)로 남�."
 
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2148,20 +2156,20 @@ msgstr ""
 "충�! (%s/삭제): %s (위치 %s) 삭제, %s�서 %s(으)로 (위치 %s). %s 버전� %s "
 "트리� 남� (위치 %s)."
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "�름바꾸기"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "�름바꿈"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s�(는) %s� 있는 디렉터리로 %s(으)로 �름� 바꿉니다"
 
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2170,140 +2178,140 @@ msgstr ""
 "충�! (�름바꾸기/�름바꾸기): \"%3$s\" 브랜치�서 �름바꾸기 \"%1$s\"->"
 "\"%2$s\" \"%6$s\" 브랜치�서 �름 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (해결�지 않�)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "대신 �름� %s�서 %s(으)로 바꾸고 %s�서 %s(으)로 바꿉니다"
 
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "병합� %s�(를) 추가합니다"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "대신 %s(으)로 추가합니다"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "%s 오브�트를 �� 수 없습니다"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "%s 오브�트는 블롭� 아닙니다"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "수정"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "수정�"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "ë‚´ìš©"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "추가/추가"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "건너뛰기: %s (기존과 같게 병합)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�� 병합: %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "하위 모듈"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "충�! (%s): %s� 병합 충�"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "제거: %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "파�/디렉터리"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "디렉터리/파�"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "추가: %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "�미 업��트 �태입니다!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "%s � %s 트리� 병합� 실패했습니다"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "병합:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "과거� 공통 커밋 %u개 발견:"
 
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "병합 결과� 커밋� 없습니다"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "'%s' 오브�트를 파싱할 수 없습니다"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "��스를 쓸 수 없습니다."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2314,7 +2322,7 @@ msgstr ""
 "새로 노트 병합� 시작하기 전� 'git notes merge --commit'\n"
 "�는 'git notes merge --abort'로 �전 병합� 커밋/중지하십시오."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "노트 병합 작업� 다 마치지 않았습니다. (%s 있�)"
@@ -2342,16 +2350,30 @@ msgstr "%s�서 노트를 다시 쓰기를 거부합니다 (refs/notes/ 밖임)
 msgid "Bad %s value: '%s'"
 msgstr "잘못� %s 값: '%s'"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "오브�트를 파싱할 수 없습니다: %s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "오프셋� 묶� 파� 앞입니다 (�가진 .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "오프셋� %s� 묶� ��스 시작보다 앞입니다 (�가진 ��스?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "오프셋� %s� 묶� ��스 �보다 뒤입니다 (�가진 ��스?)"
+
 #: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "사용법: %s"
@@ -2359,17 +2381,17 @@ msgstr "사용법: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "  �는: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2378,7 +2400,7 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "잘못� 형�� 오브�트 �름 '%s'"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "%s�(를) 그룹�서 쓰기 가능하�� 만들 수 없습니다"
@@ -2450,7 +2472,7 @@ msgstr "'%s' (단축키: '%c')"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: 경로명세 지시어가 � 명령어�서 지�하지 않습니다: %s"
 
-#: pathspec.c:575
+#: 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"
@@ -2458,12 +2480,12 @@ msgstr ""
 "경로명세로 빈 문�열� 넣는 �� 다� 릴리스�서 오류로 취급할 예정입니다. 모"
 "든 경로를 지정하려면 �(.)� 사용하십시오."
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "'%s' 경로명세는 심볼릭 �� 아래� 있습니다"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "--pretty 형�� 파싱할 수 없습니다"
 
@@ -2485,50 +2507,51 @@ msgstr ""
 "GIT_INDEX_VERSION� 설정�었지만, � 값� 잘못�었습니다.\n"
 "%i 버전� 사용합니다"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "'%s'�(를) 닫� 수 없습니다"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "'%s'�(를) stat()할 수 없습니다"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "git 디렉터리를 열 수 없습니다: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "�� 해제할 수 없습니다: %s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "격리� 환경�서 레�런스 업��트가 금지�니다"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "%s 레�런스를 제거할 수 없습니다"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "%s 레�런스를 삭제할 수 없습니다: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "레�런스를 삭제할 수 없습니다: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "%s 레�런스를 제거할 수 없습니다"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "없�"
@@ -2558,147 +2581,147 @@ msgstr "예�한 형�: %%(color:<색>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "��할 수 없는 색: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "정수 값� 와야 합니다 refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "정수 값� 와야 합니다 refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "��할 수 없는 %%(%s) ��: %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body)� ��를 받지 않습니다"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject)� ��를 받지 않습니다"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers)� ��를 받지 않습니다"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "알 수 없는 %%(trailers) 옵션 ��: %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "'contents:lines=%s'�서 0보다 � 값� 와야 합니다"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "알 수 없는 %%(contents) ��: %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "'contents:short=%s'�서 0보다 � 값� 와야 합니다"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "알 수 없는 %%(objectname) ��: %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "예�한 형�: %%(align:<너비>,<위치>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "��할 수 없는 위치:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "��할 수 없는 너비:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "��할 수 없는 %%(align) ��:%s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "%%(align) 아톰� 너비가 0보다 커야 합니다"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "��할 수 없는 %%(if) ��: %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "잘못� 형�� 필드 �름: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "알 수 없는 필드 �름: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "형�: %%(if) 아톰� %%(then) 아톰 없� 사용�었습니다"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "형�: %%(then) 아톰� %%(if) 아톰 없� 사용�었습니다"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "형�: %%(then) 아톰� 여러번 사용�었습니다"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "형�: %%(then) 아톰� %%(else) 뒤� 사용�었습니다"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "형�: %%(else) 아톰� %%(if) 아톰 없� 사용�었습니다"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "형�: %%(else) 아톰� %%(then) 아톰 없� 사용�었습니다"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "형�: %%(else) 아톰� 여러번 사용�었습니다"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "형�: %%(end) 아톰� 대��는 아톰 없� 사용�었습니다"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "잘못� 형�� 문�열 %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(브랜치 없�, %s 리베�스)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(브랜치 없�, �등분 %s�서 시작)"
@@ -2706,7 +2729,7 @@ msgstr "(브랜치 없�, �등분 %s�서 시작)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD %s 위치�서 분리�)"
@@ -2714,108 +2737,108 @@ msgstr "(HEAD %s 위치�서 분리�)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD %s(으)로부터 분리�)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(브랜치 없�)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "없는 오브�트 %s, %s� 대해"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "%s� parse_object_buffer 실패 (%s� 대해)"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "'%s'� 잘못� 형�� 오브�트"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "�가진 �름 %s� 레�런스를 무시합니다"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "�가진 레�런스 %s 무시"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "형�: %%(end) 아톰� 없습니다"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "잘못� 형�� 오브�트 �름 %s"
 
-#: remote.c:747
+#: remote.c:750
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "%s � %s�(를) 모� %s� 가져올 수 없습니다"
 
-#: remote.c:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s�(는) 보통 %s�(를) 추�하고, %s�(를) 추�하지 않습니다"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s�(는) %s � %s 모� 추�합니다"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD가 브랜치를 가리키지 않습니다"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "그런 브랜치가 없습니다: '%s'"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "'%s' 브랜치� 대해 업스트림� 설정하지 않았습니다"
 
-#: remote.c:1698
+#: remote.c:1699
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "업스트림 '%s' 브랜치가 리모트 추� 브랜치로 저장�지 않았습니다"
 
-#: remote.c:1713
+#: remote.c:1714
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "리모트 '%2$s'� 푸시 대� '%1$s'� 로컬 추� 브랜치가 없습니다"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "'%s' 브랜치� 푸시 리모트가 없습니다"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "'%s'� 대한 푸시 레�런스명세� '%s'�(가) 들어 있지 않습니다"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "푸시� 대�� 없습니다 (push.default가 'nothing'입니다)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "하나� 대�� 대해 'simple' 푸시를 처리할 수 없습니다"
 
@@ -2830,7 +2853,7 @@ msgstr "  (바로잡으려면 \"git branch --unset-upstream\"� 사용하십시
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "브랜치가 '%s'� 맞게 업��트� �태입니다.\n"
 
 #: remote.c:2087
@@ -2871,16 +2894,16 @@ msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (리모트� 브랜치를 현재 브랜치로 병합하려면 \"git pull\"� 사용하십시오)\n"
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "현재 브랜치가 �가진 것처럼 보입니다"
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "현재 '%s' 브랜치� 아� 아무 커밋� 없습니다"
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 옵션� --bisect 옵션과 호환�지 않습니다"
 
@@ -2921,24 +2944,24 @@ msgstr "받는 쪽�서 --atomic 푸시를 지�하지 않습니다"
 msgid "the receiving end does not support push options"
 msgstr "받는 쪽�서 푸시 옵션� 지�하지 않습니다"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "알 수 없는 �작: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2946,7 +2969,7 @@ msgstr ""
 "� 충�� 해결한 뒤�, 바로잡� 경로를\n"
 "'git add <경로>' �는 'git rm <경로>'로 표시하십시오"
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2956,42 +2979,43 @@ msgstr ""
 "'git add <경로>' �는 'git rm <경로>'로 표시하십시오.\n"
 "그리고 결과물� 'git commit'으로 커밋하십시오"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "'%s'�(를) 잠글 수 없습니다"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "'%s'� 쓸 수 없습니다"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "'%s'� 줄바꿈� 쓸 수 없습니다"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "'%s' 마치는� 실패했습니다."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "로컬 변경 사항� %s 때문� �어 쓰게 �니다."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr "변경 사항� 커밋하거나 스태시한 다� 계�하십시오."
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: 정방향 진행"
@@ -2999,20 +3023,20 @@ msgstr "%s: 정방향 진행"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: 새 ��스 파�� 쓸 수 없습니다"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "HEAD 커밋� 처리할 수 없습니다\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "�시 트리를 업��트할 수 없습니다\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3042,17 +3066,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "%s 커밋� 파싱할 수 없습니다\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "%s �전 커밋� 파싱할 수 없습니다\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3063,7 +3087,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3074,230 +3098,231 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "커밋 %d개가 섞� 결과입니다."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "바로잡으려면 HEAD가 필요합니다"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "HEAD� 커밋 메시지를 �� 수 없습니다"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "'%s'�(를) 쓸 수 없습니다"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "1번째 커밋 메시지입니다:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "%s� 커밋 메시지를 �� 수 없습니다"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "커밋 메시지 #%d번입니다:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "커밋 메시지 #%d번� 건너�니다:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "알 수 없는 명령: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "��스 파�� 병합�지 않았습니다."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "%s 커밋� 병합�지만 -m 옵션� 주어지지 않았습니다."
 
 # FIXME: "parent %d" 번호가 무슨 �미?
-#: sequencer.c:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "%s 커밋� �전 커밋 %d�(가) 없습니다"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "메���� 지정했지만 %s 커밋� 병합 커밋� 아닙니다."
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: %s �전 커밋� 파싱할 수 없습니다"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 �름� 바꿀 수 없습니다"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "다�� ��릴(revert) 수 없습니다: %s... %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "다�� �용할(apply) 수 없습니다: %s... %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "빈 커밋 모�� 건너 �니다"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: ��스 �기� 실패했습니다"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: ��스 새로 고침� 실패했습니다"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "잘못� 줄 %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "�전 커밋 없� '%s' 수행할 수 없습니다"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "'%s'�서 �� 수 없습니다."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "사용 불가능 �스트럭션 시트: '%s'"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "파싱한 커밋� 없습니다."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "��리기(revert) 중� 빼오기(cherry-pick)를 할 수 없습니다."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "빼오기(cherry-pick) 중� ��리기(revert)를 할 수 없습니다."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "잘못� 키: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s� 값� 잘못�: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "형�� 잘못� 옵션 시트: '%s'"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "�미 커밋 빼오기(cherry-pick) �는 ��리기(revert)가 진행 중입니다"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령� 해 보십시오"
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "HEAD를 잠글 수 없습니다"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "빼오기(cherry-pick) �는 ��리기(revert)가 진행 중�지 않습니다"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "HEAD를 구해 올 수 없습니다"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr "새로 만들고 있는 브랜치�서 중지할 수 없습니다"
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "'%s'�(를) 열 수 없습니다"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "'%s'�(를) �� 수 없습니다: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "예�치 못하게 파�� �났습니다"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "빼오기 전� 저장한 HEAD 파��('%s') ���었습니다"
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "HEAD를 옮긴 것 같습니다. ��리지 않습니다. HEAD를 확�하십시오!"
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 복사할 수 없습니다"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "��스를 �� 수 없습니다"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3312,11 +3337,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "그리고 ��스 그리고/�는 작업 ��� 변경 사항� 있습니다\n"
 
-#: sequencer.c:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3333,17 +3358,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�� 스태시 �용.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "%s�(를) 저장할 수 없습니다"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3354,57 +3379,57 @@ msgstr ""
 "변경 사항� 스태시 안� 안전하게 들어 있습니다.\n"
 "언제든지 \"git stash pop\" �는 \"git stash drop\"� 실행할 수 있습니다.\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "%s...  %.*s 위치�서 멈췄습니다\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "알 수 없는 명령 %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "orig-head를 �� 수 없습니다"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "'onto'를 �� 수 없습니다"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "%s�(를) 업��트할 수 없습니다"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "HEAD를 %s 위치로 업��트할 수 없습니다"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "리베�스할 수 없습니다: 스테�징하지 않� 변경 사항� 있습니다."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "없는 커밋� 수정할 수 없습니다"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "잘못� 키: '%s'"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "잘못� 내용: '%s'"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3414,24 +3439,108 @@ msgstr ""
 "작업 ��� 커밋하지 않� 변경 사항� 있습니다. � 사항� 먼저\n"
 "커밋하고 'git rebase --continue' 명령� 다시 실행하십시오."
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "스테�징한 변경 사항� 커밋할 수 없습니다."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s 커밋� 빼올 수 없습니다"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: 잘못� 리비전"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "최초� 커밋으로 ��릴 수 없습니다"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: 처리하지 않� 옵션"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: 리비전 준비 중 오류"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "사용할 수 없는 할 � 목�: %s"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "'%s'�(를) 쓰기 용으로 열 수 없습니다"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "rebase.missingCommitsCheck 옵션� 대해 ��할 수 없는 %s 설정. 무시합니다."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"경고: �부 커밋� ��치 않게 버려졌� 수� 있습니다.\n"
+"버려진 커밋 (최근�서 과거 순서):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"� 메시지를 보지 않으려면, \"drop\"� 사용해 명시�으로 커밋� 제거하십시오.\n"
+"\n"
+"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니다.\n"
+"가능한 �작�: ignore, warn, error\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"'git rebase --edit-todo' 명령으로 바로잡� 수 있고 'git rebase --continue' 명령� 실행합니다.\n"
+"�는 'git rebase --abort' 명령으로 리베�스를 중지할 수� 있습니다.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' 커밋� 파싱할 수 없습니다"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "'%s' 파�� �를 수 없습니다"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "스�립트를 �미 재구성했습니다"
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "'%s'�(를) 마칠 수 없습니다"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3463,34 +3572,34 @@ msgstr ""
 "경로와 리비전� 구분하려면 다�과 같� '--'를 사용하십시오:\n"
 "'git <명령> [<리비전>...] -- [<파�>...]'"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "깃 저장소 버전 <= %d 버전� 기대하지만, %d 버전� 발견�었습니다"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "알 수 없는 저장소 확장� 있습니다:"
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "(현재 �� �는 �위 ��가) 깃 저장소가 아닙니다: %s"
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "현재 디렉터리로 �아올 수 없습니다"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "현재 작업 디렉터리를 �� 수 없습니다"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "'%s' 위치로 ��할 수 없습니다"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3500,7 +3609,7 @@ msgstr ""
 "파� 시스템 경계�서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정�지 않"
 "�)"
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3509,56 +3618,42 @@ msgstr ""
 "core.sharedRepository 파�모드 값� (0%.3o) 문제가 있습니다.\n"
 "파�� 소유�� �기와 쓰기 권한� 있어야 합니다."
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "'%s' 경로가 없습니다"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "레�런스 '%s' 저장소를 연결� 체�아웃으로 쓰기는 아� 지�하지 않습니다."
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "레�런스 '%s' 저장소가 로컬 저장소가 아닙니다."
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "레�런스 '%s' 저장소가 얕� 저장소입니다"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "레�런스 '%s' 저장소가 붙어 있는 저장소입니다"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "오프셋� 묶� 파� 앞입니다 (�가진 .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "오프셋� %s� 묶� ��스 시작보다 앞입니다 (�가진 ��스?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "오프셋� %s� 묶� ��스 �보다 뒤입니다 (�가진 ��스?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "짧� SHA1 %s�(는) 여럿� 대��니다"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "후보는 다�과 같습니다:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3580,65 +3675,70 @@ msgstr ""
 "확�해 보시고 잘못 만들어진 것�면 지우십시오. � 메시지를 보고 싶지\n"
 "않으면 \"git config advice.objectNameWarning false\" 명령� 사용하십시오."
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "병합하지 않� .gitmodules를 바꿀 수 없습니다. 병합 충�� 먼저 해결하십시오"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "경로가 %s� 때 .gitmodules� 섹션� 찾� 수 없습니다"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ".gitmodules 항목 %s�(를) 업��트할 수 없습니다"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "%s� 대한 .gitmodules 항목� 제거할 수 없습니다"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "업��트한 .gitmodules를 커밋할 사항으로 표시하는� 실패"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 값� �수를 쓸 수 없습니다"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "내용� 없는 하위 모듈 '%s'�서"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "경로명세 '%s'�(는) ''%.*s' 하위 모듈 안� 있습니다"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "서브모듈 항목 '%s'(%s)�(는) %s�고, 커밋� 아닙니다"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD를 올바른 레�런스로 구해내는� 실패했습니다."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s'�(는) 깃 저장소로 ���지 않습니다"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "하위 모듈 '%s'�서 'git status'를 시작할 수 없습니다"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "하위 모듈 '%s'�서 'git status'를 실행할 수 없습니다"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "'%s' 하위 모듈� 변경� ��스가 있습니다"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3646,18 +3746,18 @@ msgstr ""
 "여러 개� 작업 ��가 있는 하위 모듈 '%s'� 대해 relocate_gitdir� 지�하지 "
 "않습니다"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "하위 모듈 '%s'� �름� 찾아볼 수 없습니다"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3668,94 +3768,98 @@ msgstr ""
 "'%s'�서\n"
 "'%s'(으)로\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "재귀�으로 '%s' 하위 모듈� 들어갈 수 없습니다"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "'..' 안�서 ls-files를 시작할 수 없습니다"
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "버그: 리턴� 경로 문�열� 현재 디렉터리와 맞지 않습니다?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree가 예�치 못한 코드 %d번� 리턴했습니다"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 값� �수를 쓸 수 없습니다"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s� 값� 올바르지 않습니다"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "트레�러 명령 '%s' 실행 실패"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "알 수 없는 값 '%s', 키 '%s'"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "%s�(가) 여러개입니다"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "트레�러 '%.*s'�서 빈 트레�러 토�"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "'%s' 입력 파�� �� 수 없습니다"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "표준 입력�서 �� 수 없습니다"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "%s� 대해 stat()할 수 없습니다"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "'%s' 파�� �반 파�� 아닙니다"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "사용�가 %s 파�� 쓸 수 없습니다"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "임시 파�� 열 수 없습니다: %s"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "임시 파� �름� '%s'(으)로 바꿀 수 없습니다"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "'%1$s'� 업스트림� '%3$s'� '%2$s'(으)로 설정합니다\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: 잘못� 깊� 옵션: %s"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3764,7 +3868,7 @@ msgstr ""
 "다� 하위 모듈 경로� 리모트 어디�� 없는\n"
 "변경 사항� 있습니다:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3791,7 +3895,7 @@ msgstr ""
 "명령� 시�해 보십시오\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "중지함."
 
@@ -3812,11 +3916,11 @@ msgstr "트리 엔트리� 잘못� 형�� 모드"
 msgid "empty filename in tree entry"
 msgstr "트리 엔트리� 빈 파� �름"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "너무 짧� 트리 파�"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3825,7 +3929,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
 "%%s브랜치를 전환하기 전� 변경 사항� 커밋하거나 스태시하십시오."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3834,7 +3938,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� 체�아웃 때문� �어 쓰게 �니다:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3843,14 +3947,14 @@ 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"
 "%%s"
 msgstr "다� 파�� 로컬 변경 사항� 병합 때문� �어 쓰게 �니다."
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3859,7 +3963,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
 "%%s%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"
@@ -3868,7 +3972,7 @@ msgstr ""
 "다� 파�� 로컬 변경 사항� %s 때문� �어 쓰게 �니다:\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3877,7 +3981,7 @@ msgstr ""
 "다� 디렉터리를 업��트하면 그 안� 추�하지 않는 파�� 잃어버립니다:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3886,7 +3990,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"
@@ -3895,7 +3999,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3904,7 +4008,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"
@@ -3913,7 +4017,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3922,7 +4026,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 ��� 파�� 제거�니다:\n"
 "%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3931,7 +4035,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 �� 파�� 제거�니다:\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3941,7 +4045,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 ��� 파�� �어�니다:\n"
 "%%s브랜치를 전환하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3951,7 +4055,7 @@ msgstr ""
 "체�아웃 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3960,7 +4064,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"
@@ -3969,7 +4073,7 @@ msgstr ""
 "병합 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3978,7 +4082,7 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 ��� 파�� �어�니다:\n"
 "%%s%s 하기 전� � 파�� 옮기거나 제거하십시오."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3987,22 +4091,21 @@ msgstr ""
 "%s 때문� 추�하지 않는 다� 작업 �� 파�� �어�니다:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "'%s' 항목� '%s'와(과) 겹칩니다.  묶� 수 없습니다."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
-"드문 체�아웃� 업��트할 수 없습니다. 다� 항목� 최신으로 업��트�지 않"
-"았습니다:\n"
+"드문 체�아웃� 업��트할 수 없습니다. 다� 항목� 최신으로 업��트�지 않았습니다:\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4013,7 +4116,7 @@ msgstr ""
 "다:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4024,7 +4127,7 @@ msgstr ""
 "다:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4033,17 +4136,12 @@ msgstr ""
 "하위 모듈�  업��트할 수 없습니다:\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "중지함\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "하위 모듈 업��트 전략� '%s' 하위 모듈�서 지�하지 않습니다"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "파�� 가져옵니다"
 
@@ -4086,13 +4184,8 @@ msgstr "'%s'�(를) �는� 실패했습니다"
 msgid "could not open '%s' for reading and writing"
 msgstr "�기와 쓰기용으로 '%s'�(를) 열 수 없습니다"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s'�(를) 쓰기용으로 열 수 없습니다"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "'%s'�(를) �기용으로 열 수 없습니다"
@@ -4116,196 +4209,196 @@ msgstr "%s� 쓸 수 없습니다"
 msgid "could not close %s"
 msgstr "%s�(를) 닫� 수 없습니다"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "병합하지 않� 경로:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git reset %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (스테�지 해제하려면 \"git rm --cached <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (해결했다고 표시하려면 알맞게 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (해결했다고 표시하려면 \"git rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "커밋할 변경 사항:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "커밋하�� 정하지 않� 변경 사항:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:224
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (무엇� 커밋할지 바꾸려면 \"git add/rm <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:225
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (작업 ��� 변경 사항� 버리려면 \"git checkout -- <파�>...\"� 사용하십"
 "시오)"
 
-#: wt-status.c:227
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (하위 모듈� 추��지 않는 파��나 수정� 내용� 커밋하거나 버리십시오)"
 
-#: wt-status.c:239
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (커밋할 사항� �함하려면 \"git %s <파�>...\"� 사용하십시오)"
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "양쪽�서 삭제:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "� 쪽�서 추가:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "저 쪽�서 삭제:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "저 쪽�서 추가:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "� 쪽�서 삭제:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "양쪽�서 추가:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "양쪽�서 수정:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "새 파�:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "복사함:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "삭제함:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "수정함:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "�름 바꿈:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "종류 바뀜:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "알 수 없�:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "병합하지 않�:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "새 커밋, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "수정한 내용, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "추�하지 않� 내용, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "현재 스태시� %d개 항목� 있습니다"
 
-#: wt-status.c:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "변경�었지만 업��트하지 않� 하위 모듈:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "커밋할 하위 모듈� 변경 사항:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"위� 줄� 바꾸지 마십시오.\n"
-"아래 있는 내용� 모� 제거�니다."
+"위� 줄� 바꾸거나 지우지 마십시오.\n"
+"아래 있는 내용� 모� 무시�니다."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "병합하지 않� 경로가 있습니다."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (충�� 바로잡고 \"git commit\"� 실행하십시오)"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (병합� 중단하려면 \"git merge --abort\"를 사용하십시오)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "모든 충�� 바로잡았지만 아� 병합하는 중입니다."
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (병합� 마무리하려면 \"git commit\"� 사용하십시오)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "am 세션 중간� 있습니다."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "현재 패치가 비어 있습니다."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (충�� 바로잡� 다� \"git am --continue\"를 사용하십시오)"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (� 패치를 건너 뛰려면 \"git am --skip\"� 사용하십시오)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (�본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
 
@@ -4595,7 +4688,7 @@ msgstr "추가로, ì�¸ë�±ìŠ¤ì—� 커밋하지 ì•Šì�€ 변경 사항ì�´ 있습니ë‹
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s 할 수 없습니다: ��스� 커밋하지 않� 변경 사항� 있습니다."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "'%s' 파� 삭제� 실패했습니다"
@@ -4609,7 +4702,7 @@ msgstr "git add [<옵션>] [--] <경로명세>..."
 msgid "unexpected diff status %c"
 msgstr "예�치 못한 diff �태 %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "파� 업��트가 실패했습니다"
 
@@ -4618,108 +4711,108 @@ msgstr "파� 업��트가 실패했습니다"
 msgid "remove '%s'\n"
 msgstr "'%s' 제거\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "��스를 새로 고친 다� 커밋 표시하지 않� 변경 사항:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "'%s' 파�� 쓰기용으로 열 수 없습니다."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "패치를 쓸 수 없습니다"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "패치 편집� 실패했습니다"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "'%s'�(를) stat()할 수 없습니다"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "빈 패치. 중지."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "'%s'�(를) �용할 수 없습니다"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "다� 경로는 .gitignore 파� 중 하나 때문� 무시합니다:\n"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "가짜로 실행"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "대화�으로 고릅니다"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "대화�으로 변경� 부분� 선�합니다"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "현재 diff를 편집하고 �용합니다"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "무시하는 파�� 추가를 허용합니다"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "추��는 파�� 업��트합니다"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "나중� 추가할 것��는 사실만 기�합니다"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "추��고 추��지 않는 모든 파�� 변경 사항� 추가합니다"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "작업 ���서 제거한 경로를 무시합니다 (--no-all과 ��)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "추가하지 않고 ��스만 새로 고칩니다"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr "오류 때문� 추가할 수 없는 파�� 건너�니다"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "가짜로 실행했� 때 파�� 무시하는지 확�합니다"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "목�� 파��서 실행 가능 비트를 바꿉니다"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "내장 저장소를 추가할 때 경고를 표시합니다"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4749,151 +4842,151 @@ msgstr ""
 "\n"
 "� �세한 정보는 \"git help submodule\"� 참고하십시오."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "내장 깃 저장소 추가: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "정�로 추가하려면 -f 옵션� 사용하십시오.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "파� 추가가 실패했습니다"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A � -u 옵션� 서로 호환�지 않습니다"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "--ignore-missing 옵션� --dry-run 옵션과 같� 사용할 경우�만 쓸 수 있습니다."
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod 파�미터 '%s'�(는) -x �는 +x 형��어야 합니다"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "아무 것� 지정하지 않았으므로 아무 것� 추가하지 않습니다.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "'git add .' 명령� 실행하려고 한 것 아니었습니까?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "��스 파�� ���었습니다"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "작성� 스�립트를 파싱할 수 없습니다"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "applypatch-msg 훅 때문� '%s'�(가) 삭제�었습니다."
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "잘못� 형�� 입력 줄: '%s'."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "'%s'�서 '%s'(으)로 노트를 복사하는� 실패했습니다"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "fseek 실패"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "'%s' 패치를 파싱할 수 없습니다"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "한번� 하나� StGIT 패치 시리즈만 �용할 수 있습니다"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "시�� 잘못�었습니다"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "Date 줄� 잘못�었습니다"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "시간대 오프셋� 잘못�었습니다"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "패치 형� 검색� 실패했습니다."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' 디렉터리 만들기가 실패했습니다"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "패치를 쪼개는� 실패했습니다."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "��스 파�� 쓸 수 없습니다"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "� 문제를 해결했� 때 \"%s --continue\"를 실행하십시오."
 
-#: builtin/am.c:1172
+#: builtin/am.c:1194
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "� 패치를 건너뛰려면, 그 대신 \"%s --skip\"� 실행하십시오."
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "�래 브랜치를 복구하고 패치 �용� 중지하려면 \"%s --abort\"를 실행하십시오."
 
-#: builtin/am.c:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "패치가 비어 있습니다."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "잘못� 신� 줄: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "%s 커밋� 파싱할 수 없습니다"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "저장소� 3-방향 병합으로 대신할 때 필요한 블롭� 없습니다."
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr "��스 정보를 사용해 기본 트리를 다시 만듭니다..."
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4901,38 +4994,38 @@ msgstr ""
 "패치를 �접 편집하셨습니까?\n"
 "� 패치는 ��스� 기�� 블롭�는 �용�지 않습니다."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "베�스 패치 �용 � 3-방향 병합으로 대신합니다..."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "변경 사항�서 병합하는� 실패했습니다."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree가 트리를 쓰는� 실패했습니다"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "빈 커밋 내역� 대해 �용합니다"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "커밋 오브�트를 쓰는� 실패했습니다"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "다시 시작할 수 없습니다: %s�(가) 없습니다."
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "터미�� 표준 입력� 연결�지 않� �태�서 대화형으로 실행할 수 없습니다."
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "커밋 본문�:"
 
@@ -4940,35 +5033,35 @@ msgstr "커밋 본문�:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "�용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모� �용[a]: "
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "변경� ��스: 패치를 �용할 수 없습니다 (dirty: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�용하는 중: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "변경 사항 없� -- 패치가 �미 �용�었습니다."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "패치가 %s %.*s 위치�서 실패했습니다"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "실패한 패치� 복사본� 다� 위치� 있습니다: %s"
 
-#: builtin/am.c:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -4978,7 +5071,7 @@ msgstr ""
 "커밋으로 표시할 사항� 남아 있지 않으면, �미 같� 패치�서 �용�\n"
 "경우� 수� 있습니다. 그런 경우�는 � 패치를 건너뛰면 �니다."
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -4989,17 +5082,17 @@ msgstr ""
 "충�� 해결한 파�� 'git add'해서 해결했다고 표시해야 합니다.\n"
 "파�� \"저 쪽�서 삭제\"를 받아들�려면 `git rm`� 실행하십시오."
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "'%s' 오브�트를 파싱할 수 없습니다."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "��스 지우기� 실패했습니다"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5007,137 +5100,136 @@ msgstr ""
 "마지막 'am' 실패 �후 HEAD를 옮긴 것 같습니다.\n"
 "ORIG_HEAD로 ��리지 않습니다."
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "--patch-format 옵션� 대해 잘못� 값: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<옵션>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "대화형으로 실행합니다"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "아무 �작� 하지 않습니다 (과거부터 있었� 옵션)"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "필요하면 3-방향 병합으로 대신하�� 허용합니다"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "간략히 표시합니다"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr "커밋 메시지� Signed-off-by 줄� 남�니다"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "UTF-8 �코딩으로 변환합니다 (기본값)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "git-mailinfo� -k 옵션� �니다"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "git-mailinfo� -b 옵션� �니다"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "git-mailinfo� -m 옵션� �니다"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "mbox 형�� 대해 git-mailsplit� --keep-cr 옵션� 사용합니다"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "am.keepcr� 무관하게 git-mailsplit� --keep-cr 옵션� 사용하지 않습니다."
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "절취선 앞� 모든 사항� 무시합니다"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "git-apply� 넘�니다"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "형�"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "패치� 형�"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "패치 실패가 발�했� 때 오류 메시지 대신 사용합니다"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "충�� 해결한 다� 패치 �용� 계�합니다"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "--continue 옵션과 ��"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "현재 패치 건너뛰기"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr "�래 브랜치를 복구하고 패치 �용 작업� 중지합니다."
 
 # NOTE: 옵션� �미는 �게 맞다. �문�서는 사용�가
 # --committer-date-is-author-date�는 옵션� 보고 �미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "커미터 시�� 작성� 시�으로 넣습니다"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "현재 시�� 작성� 시�으로 사용합니다"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "키-ID"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "GPG 서명 커밋"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(git-rebase를 위한 내부 용�)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5145,16 +5237,16 @@ msgstr ""
 "-b/--binary 옵션� 오랜 시간 �안 아무 �작� 하지 않았으므로, �\n"
 "옵션� 제거� 예정입니다. �제 사용하지 마십시오."
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "��스 �기� 실패했습니다"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "�전 리베�스 디렉터리 %s�(가) 아� 있고 mbox를 지정했습니다."
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5163,7 +5255,7 @@ msgstr ""
 "벗어난 %s 디렉터리가 발견�었습니다.\n"
 "제거하려면 \"git am --abort\"를 사용하십시오."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "해소 작업� 진행 중입니다. 다시 시작하지 않습니다."
 
@@ -5365,14 +5457,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<옵션>] (-c | -C) [<과거-브랜치>] <새-브랜치>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<옵션>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5381,7 +5477,7 @@ msgstr ""
 "'%s' 브랜치를 삭제합니다. � 브랜치는 '%s'�\n"
 "         병합�었지만, HEAD�는 병합�지 않았습니다."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5390,12 +5486,12 @@ msgstr ""
 "'%s' 브랜치를 삭제하지 않습니다. � 브랜치는 '%s'�\n"
 "         병합�지 않았지만, HEAD�는 병합�었습니다."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "'%s'� 대한 커밋 오브�트를 찾아볼 수 없습니다"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5404,91 +5500,112 @@ msgstr ""
 "'%s' 브랜치가 완전히 병합�지 않았습니다.\n"
 "정�로 삭제하려면 'git branch -D %s' 명령� 실행하십시오."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "config-file 업��트가 실패했습니다"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "-a 옵션� -d 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "HEAD� 대한 커밋 오브�트를 찾아볼 수 없습니다"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "'%2$s' 위치� 체�아웃한 '%1$s' 브랜치를 삭제할 수 없습니다"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "리모트 추� '%s' 브랜치가 없습니다."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "'%s' 브랜치가 없습니다."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "리모트 추� '%s' 브랜치를 삭제하는� 오류"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "'%s' 브랜치를 삭제하는� 오류"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "리모트 추� '%s' 브랜치를 삭제합니다. (과거 %s)\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "%s 브랜치 삭제 (과거 %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "�맷 문�열� 파싱할 수 없습니다"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "%s 브랜치를 %s 위치� 리베�스합니다"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "%s 브랜치를 %s 위치�서 bisect합니다"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "브랜치 위� 없으면서 현재 브랜치를 복사할 수 없습니다."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr "브랜치 위� 없으면서 현재 브랜치 �름� 바꿀 수 없습니다."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "잘못� 브랜치 �름: '%s'"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "브랜치 �름 바꾸기 실패"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "브랜치 복사 실패"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "�름� 잘못� '%s' 브랜치를 복사합니다"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�름� 잘못� '%s' 브랜치� �름� 다르게 바꿉니다"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "브랜치 �름� %s(으)로 바꾸지만, HEAD를 업��트하지 않습니다!"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "브랜치� �름� 바꾸지만, config-file 업��트가 실패했습니다"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "브랜치를 복사했지만, config-file 업��트가 실패했습니다"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5499,177 +5616,185 @@ msgstr ""
 "  %s\n"
 "'%c' 문�로 시작하는 줄� 무시�니다.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "�반 옵션"
 
 # FIXME: give twice?
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "해시와 제목� 표시하고, 업스트림 브랜치� 대한 위치를 표시합니다"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "여러가지 안내 메시지를 표시하지 않습니다"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "추� 모드를 설정합니다 (git-pull(1) 참고)"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "업스트림 정보를 바꿉니다"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "사용하지 않습니다"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "업스트림"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "업스트림 정보를 바꿉니다"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "업스트림 정보를 해제합니다"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "여러 색으로 출력합니다"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "리모트 추� 브랜치� 대해 �작합니다"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "커밋� 있는 브랜치만 표시합니다"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "커밋� 들어있지 않� 브랜치만 표시합니다"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "특정 git-branch �작:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "리모트와 로컬� 브랜치 목�� 모� 표시합니다"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "완전히 병합� 브랜치를 삭제합니다"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "브랜치를 삭제합니다 (병합�지 않았���)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "브랜치와 그 reflog를 옮기거나 �름� 바꿉니다"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "대�� �미 있��� 브랜치를 옮기거나 �름� 바꿉니다"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "브랜치와 그 reflog를 복사합니다"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "대�� �미 있��� 브랜치를 복사합니다"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "브랜치 �름 목�� 표시합니다"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "브랜치� reflog를 만듭니다"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "브랜치� 설명� 편집합니다"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "강제로 만들고, 옮기거나 �름� 바꾸고, 삭제합니다"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "병합�는 브랜치만 표시합니다"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "병합�지 않는 브랜치만 표시합니다"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "목�� 여러 열로 표시합니다"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "키"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "정렬한 기준� �는 필드 �름"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "오브�트"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "해당 오브�트� 브랜치만 표시합니다"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "정렬과 필터�� 대소문�를 구분하지 않습니다"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "출력� 사용할 형�"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "HEAD를 올바른 레�런스로 구해내는� 실패했습니다."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "레�런스/헤드 아래� HEAD가 없습니다!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column � --verbose 옵션� 호환�지 않습니다"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "브랜치 �름� 필요합니다"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "분리� HEAD� 대한 설명� 부여할 수 없습니다"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "여러 브랜치� 대한 설명� 편집할 수 없습니다"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "아� '%s' 브랜치� 커밋� 없습니다."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "�름� '%s'� 브랜치가 없습니다."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "�름 바꾸기 작업� 대해 브랜치가 너무 많습니다"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "복사 작업� 대해 브랜치가 너무 많습니다"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "새 업스트림� 설정하는� 브랜치가 너무 많습니다"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "�름 바꾸기 작업� 대해 ��가 너무 많습니다"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "새 업스트림� 설정하는� ��가 너무 많습니다"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5677,58 +5802,45 @@ msgstr ""
 "HEAD� 업스트림� %s(으)로 설정할 수 없습니다. 어떤 브랜치� 가리키지 않습니"
 "다."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "그런 브랜치가 ('%s') 없습니다"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "'%s' 브랜치가 없습니다"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "업스트림 설정� 해제하는� 브랜치가 너무 많습니다"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "업스트림 설정� 해제하는� ��가 너무 많습니다"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "HEAD� 업스트림 설정� 해제할 수 없습니다. 어떤 브랜치� 가리키지 않습니다."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "'%s' 브랜치� 업스트림 정보가 없습니다"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "'HEAD'를 수�으로 만드는 건 앞뒤가 맞지 않습니다"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "'git branch'� 대해 -a � -r 옵션� 브랜치 �름과 같� 쓰면 앞뒤가 맞지 않습"
 "니다"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"--set-upstream 옵션� � �� 사용�지 않고 제거� 예정입니다. --track �는 "
-"--set-upstream-to 옵션� 사용해 보십시오\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"'%s'�(를) 만들고 '%s'�(를) 추�하게 하려면, 다�� 하십시오:\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr "'--set-upstream' 옵션� � �� 사용�지 않고 제거� 예정입니다. '--track' �는 '--set-upstream-to' 옵션� 사용해 보십시오."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5743,7 +5855,7 @@ msgstr "번들� 만드려면 저장소가 필요합니다."
 msgid "Need a repository to unbundle."
 msgstr "번들� 해제하려면 저장소가 필요합니다."
 
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5751,7 +5863,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <종류> | --textconv | --filters) [--path=<경로>] <오브�트>"
 
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5759,64 +5871,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<종류>는 다� 중 하나가 � 수 있습니다: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "오브�트 종류를 봅니다"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "오브�트 �기를 봅니다"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "오류가 없� 때 0� 리턴하고 �냅니다"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "오브�트� 내용� 예�게 표시합니다"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "for blob objects, run textconv on object's content"
 msgstr "블롭 오브�트� 대해서는, 오브�트� 내용� 대해 textconv를 실행합니다"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run filters on object's content"
 msgstr "블롭 오브�트� 대해서는, 오브�트� 내용� 대해 필터를 실행합니다"
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "블롭"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "--textconv/--filters 옵션� 경로를 지정합니다"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s � -t 옵션� ��� 오브�트� 대해 �작하�� 허용합니다"
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "--batch 출력� 대해 버��합니다"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "show info and content of objects fed from the standard input"
 msgstr "표준 입력�서 입력� 오브�트� 정보와 내용� 표시합니다"
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 msgid "show info about objects fed from the standard input"
 msgstr "표준 입력�서 입력� 오브�트� 정보를 표시합니다"
 
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "트리 내부� 심볼릭 ��를 따�갑니다 (--batch �는 --batch-check와 같� 사용)"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "--batch �는 --batch-check�서 모든 오브�트를 표시합니다"
 
@@ -5844,7 +5956,7 @@ msgstr "표준 입력�서 파� �름� �습니다"
 msgid "terminate input and output records by a NUL character"
 msgstr "NUL 문�를 기준으로 �료 입력 � 출력� 멈춥니다"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "진행 �황 표시를 하지 않습니다"
 
@@ -5934,9 +6046,9 @@ msgid "write the content to temporary files"
 msgstr "내용� 임시 파�� �니다"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "문�열"
 
@@ -6007,54 +6119,54 @@ msgstr "경로를 ì—…ë�°ì�´íŠ¸í•˜ê³  '%s' 브랜치로 전환하는 ì�¼ì�€ ë�™ì‹
 msgid "path '%s' is unmerged"
 msgstr "'%s' 경로를 병합하지 않았습니다"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "현재 ��스를 먼저 해결해야 합니다"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "'%s'� 대해 reflog할 수 없습니다: %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD� 현재 위치는"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "HEAD를 업��트할 수 없습니다"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' 브랜치 리셋\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�미 '%s'� 있습니다\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' 브랜치로 전환합니다\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 그리고 %d개 �.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6072,7 +6184,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6093,161 +6205,161 @@ msgstr[0] ""
 " git branch <새-브랜치-�름> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "리비전 walk� 내부 오류"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "�전 HEAD 위치는"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "현재 위치가 만들 예정� 브랜치� 있습니다"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "하나� 레�런스만 지정해야 하지만 %d개를 지정했습니다."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "잘못� 레�런스: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "레�런스가 트리가 아닙니다: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "브랜치를 전환하는� 경로를 사용할 수 없습니다"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 옵션� 브랜치를 전환할 때 쓸 수 없습니다"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 옵션� '%s' 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "브랜치를 커밋� 아닌 '%s'(으)로 전환할 수 없습니다"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "브랜치"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "새 브랜치를 만들고 가져옵니다"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "새 브랜치� 대한 reflog를 만듭니다"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "HEAD를 해당 커밋�서 분리합니다"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "새 브랜치� 대한 업스트림 정보를 설정합니다"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "새-브랜치"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "�위 브랜치가 없는 새 브랜치"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 우리쪽 버전� 가져옵니다"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "병합�지 않� 파�� 대해 �대편 버전� 가져옵니다"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "강제로 체�아웃합니다 (로컬�서 수정한 사항� 버립니다)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "새 브랜치� 대해 3-방향 병합� 수행합니다"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "무시하는 파�� 업��트합니다 (기본값)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "스타�"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "충� 스타� (merge �는 diff3)"
 
 # FIXME: �미 불명
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "경로명세를 드문 항목�만 제한하지 않습니다"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "'git checkout <없는-브랜치>'� 대해 추측합니다"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 msgid "do not check if another worktree is holding the given ref"
 msgstr "다른 작업��� 주어진 레�런스가 있는지 확�하지 않습니다"
 
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "강제로 진행 �황� 표시합니다"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B � --orphan 옵션� 서로 호환�지 않습니다"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track 옵션� 브랜치 �름� 필요합니다"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "브랜치 �름� 없습니다. -b 옵션� 사용해 보십시오"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "경로 명세가 잘못�었습니다"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s'�(는) 커밋� 아니고 여기�서 '%s' 브랜치를 만들 수 없습니다"
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach 옵션� 경로 ��를 받지 않습니다 '%s'"
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6286,7 +6398,7 @@ msgstr "%s 저장소 건너뛸 예정\n"
 msgid "failed to remove %s"
 msgstr "%s 제거� 실패했습니다"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6299,7 +6411,7 @@ msgstr ""
 "foo        - 유�한 접�어� 해당하는 항목 선�\n"
 "           - (빈 입력) 선�하지 않�\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6320,38 +6432,38 @@ msgstr ""
 "*          - 모든 항목 선�\n"
 "           - (빈 입력) 선� 마침\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "어�� (%s)?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "무시할 패턴� 입력하십시오>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "경고: 다�� 해당하는 항목� 찾� 수 없습니다: %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "삭제할 항목� 선�하십시오"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "%s 제거합니까 [y/N]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "�.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6369,62 +6481,62 @@ msgstr ""
 "help                - � 화면 표시\n"
 "?                   - 프롬프트 선� �움�"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** 명령 ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "무엇� 할까요"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "다� 항목� 제거할 예정입니다:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "지울 파�� �제 없으므로 �냅니다."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "제거할 파� �름� 표시하지 않습니다"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "강제"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "대화형 지우기"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "전체 디렉터리 제거"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "패턴"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "규칙� 무시하려면 <패턴>� 추가하십시오"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "무시한 파�� 제거"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "무시한 파�만 제거"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x � -X 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6432,7 +6544,7 @@ msgstr ""
 "clean.requireForce가 true로 설정�었고 -i, -n, -f 옵션 중 하나� 쓰지 않았습"
 "니다. 지우지 않습니다"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6440,142 +6552,142 @@ msgstr ""
 "clean.requireForce 기본값� true�고 -i, -n, -f 옵션 중 하나� 쓰지 않았습니"
 "다. 지우지 않습니다"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "체�아웃� 만들지 않습니다"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "간략한 저장소를 만듭니다"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "로컬 저장소�서 복제합니다"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "로컬 하드��를 사용하지 않고, 항� 복사합니다"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "공유 저장소로 설정합니다"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "경로명세"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "복제한 결과물�서 하위 모듈� 초기화합니다"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "병렬�으로 복제하는 하위모듈 개수"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "서�-디렉터리"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "서�� 사용할 디렉터리 위치"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "레�런스 저장소"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "복제할 경우�만 --reference를 사용합니다"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "�름"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "업스트림 추�� 'origin' 대신 <�름>� 사용합니다"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "리모트� HEAD 대신 <브랜치>를 가져옵니다"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "리모트� git-upload-pack 경로"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "깊�"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "지정한 깊�� 얕� 복제를 만듭니다"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "시�"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "지정한 시간 �후� 얕� 복제를 만듭니다"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "리비전"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "리비전� 제외해 얕� 복제� 커밋 내역� 깊게 만듭니다"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "하나� 브랜치만 복제합니다 (HEAD �는 --branch로 지정)"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "태그를 복제하지 않습니다. 나중� 가져올 때� 태그를 따르지 않습니다."
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "모든 복제한 하위 모듈� 얕� 모듈입니다"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "깃 디렉터리를 작업 ��와 별개� 위치� 놓습니다"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "키=값"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "새 저장소 안�서 설정합니다"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "IPv4 주소만 사용합니다"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "IPv6 주소만 사용합니다"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6583,42 +6695,42 @@ msgstr ""
 "디렉터리 �름� 알아낼 수 없습니다.\n"
 "명령행�서 디렉터리를 지정하십시오"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "정보: '%s'� 대한 보조 파�� 추가할 수 없습니다: %s\n"
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s'�(를) 여는� 실패"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "'%s'�(가) 있지만 디렉터리가 아닙니다"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "'%s'� 대해 stat()� 실패했습니다\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "'%s' ��를 만드는� 실패했습니다"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "파�� '%s'(으)로 복사하는� 실패했습니다"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "완료.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6628,99 +6740,99 @@ msgstr ""
 "'git status' 명령으로 무엇� 체�아웃했는지 살펴볼 수 있고\n"
 "'git checkout -f HEAD'로 체�아웃� 다시 할 수 있습니다\n"
 
-#: builtin/clone.c:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "복제할 리모트� %s 브랜치를 찾� 수 없습니다."
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "리모트�서 필요한 오브�트를 모� 보내지 않았습니다"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "%s�(를) 업��트할 수 없습니다"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "리모트 HEAD가 없는 레�런스를 참고하므로, 체�아웃할 수 없습니다.\n"
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "작업 ��를 체�아웃할 수 없습니다"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "파�미터를 설정 파�� 쓸 수 없습니다"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "정리용으로 repack할 수 없습니다"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "보조 임시 파�� 삭제할 수 없습니다"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "너무 ��가 많습니다."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "복제할 저장소를 지정해야 합니다."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare � --origin %s 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare � --separate-git-dir 옵션� 호환�지 않습니다."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' 저장소가 없습니다"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "깊�가(%s) 0보다 � 수가 아닙니다"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "대� 경로가('%s') �미 있고 빈 디렉터리가 아닙니다."
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "작업 ��가('%s') �미 있습니다."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "'%s'� 앞 디렉터리를 만들 수 없습니다"
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "간략한 저장소로('%s') 복제합니다...\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "'%s'� 복제합니다...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6728,42 +6840,42 @@ msgstr ""
 "clone --recursive 옵션� --reference � --reference-if-able 옵션� 같� 쓰는 "
 "것과 호환�지 않습니다"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십시오."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하십"
 "시오."
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude 옵션� 로컬 복제�서 무시�니다. 대신� 'file://'� 사용하"
 "십시오."
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "�본 저장소가 얕� 저장소�므로, --local 옵션� 무시합니다"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local 옵션� 무시�니다"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "%s� 복제 방법� 알지 못합니다"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "리모트� %s 브랜치가 업스트림 %s� 없습니다"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "빈 저장소를 복제한 것처럼 보입니다."
 
@@ -6903,61 +7015,61 @@ msgstr ""
 "그 다�� \"git cherry-pick --continue\"를 하면 나머지 커밋�\n"
 "대해 커밋 빼오기를 다시 시작합니다.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD 트리 오브�트� 묶�� 푸는� 실패했습니다"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "임시 ��스를 만들 수 없습니다"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "대화형 추가가 실패했습니다"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "임시 ��스를 업��트할 수 없습니다"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "주요 �시 트리를 업��트하는� 실패했습니다"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "new_index 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "병합하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "커밋 빼오기를 하는 중 부분 커밋� 할 수 없습니다."
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "임시 ��스 파�� 쓸 수 없습니다"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "'%s' 커밋� 작성� 헤�가 없습니다"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "'%s' 커밋� 작성� 헤� 형�� 잘못�었습니다"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "--author 파�미터 형�� 잘못�었습니다"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -6965,38 +7077,38 @@ msgstr ""
 "현재 커밋 메시지�서 사용�지 않는 주� 문�를\n"
 "선�할 수 없습니다"
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "%s 커밋� 찾아볼 수 없습니다"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(표준 입력�서 로그 메시지를 ��)\n"
 
-#: builtin/commit.c:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "표준 입력�서 로그 메시지를 �� 수 없습니다"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "'%s' 로그 파�� �� 수 없습니다"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "SQUASH_MSG를 �� 수 없습니다"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "MERGE_MSG를 �� 수 없습니다"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "커밋 서�� 쓸 수 없습니다"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7011,7 +7123,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7026,7 +7138,7 @@ msgstr ""
 "\t%s\n"
 "다시 시�하십시오.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7035,7 +7147,7 @@ msgstr ""
 "변경 사항� 대한 커밋 메시지를 입력하십시오. '%c' 문�로 시작하는\n"
 "줄� 무시�고, 메시지를 입력하지 않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7046,148 +7158,148 @@ msgstr ""
 "줄� 보존�니, 필요하면 �접 제거하십시오. 메시지를 입력하지\n"
 "않으면 커밋� 중지�니다.\n"
 
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s작성�:    %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s시�:      %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s커미터: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "��스를 �� 수 없습니다"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "트리를 만드는� 오류"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "메시지를 -m �는 -F 옵션으로 입력하십시오.\n"
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' 옵션� '�름 <전�메�>' 형�� 아니고 기존 작성��� 없습니다"
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "추��지 않는 파� 모드가 ('%s') 잘못�었습니다"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long � -z 옵션� 호환�지 않습니다"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "--reset-author � --author 옵션� 모� 사용하면 앞뒤가 맞지 않습니다"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "바꿀 사항� 없습니다."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "병합 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "커밋 빼오기 중� 있습니다 -- 커밋� 바꿀 수 없습니다."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "--squash � --fixup 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "-c/-C/-F/--fixup 옵션 중� 하나만 사용할 수 있습니다."
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "-m 옵션� -c/-C/-F/--fixup 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 옵션� -C, -c �는 --amend 옵션과 같� �야 합니다."
 
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
 "다."
 
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr "경로가 없� --include/--only 옵션� 쓰면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "잘못� 정리 모드 %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "-a 옵션과 경로를 같� 사용하면 앞뒤가 맞지 않습니다."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "�태를 간략하게 표시합니다"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "브랜치 정보를 표시합니다"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "스태시 정보를 표시합니다"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "버전"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "컴퓨터가 �� 수 있는 형�"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "긴 형�으로 �태를 표시합니다 (기본값)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "NUL 문�로 항목� �냅니다"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "모드"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "추��지 않는 파�� 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "무시�는 파�� 표시합니다"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "언제"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7195,198 +7307,199 @@ msgstr ""
 "하위 모듈� 변경� 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
 "all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "추��지 않는 파�� 목�� 여러 열로 표시합니다"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "새로 만든 커밋� 찾아볼 수 없습니다"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "새로 만든 커밋� 파싱할 수 없습니다"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "HEAD 분리�"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (최�위-커밋)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "성공�� 커밋 후� 요약� 표시하지 않습니다"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "커밋 메시지 서�� diff를 표시합니다"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "커밋 메시지 옵션"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "파��서 메시지를 �습니다"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "작성�"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "커밋� 작성�를 지정합니다"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "시�"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "커밋� 시�� 지정합니다"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "메시지"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "커밋 메시지"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "커밋"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "지정한 커밋� 메시지를 재사용하고 편집합니다"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "지정한 커밋�서 메시지를 재사용합니다"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "지정한 커밋� 수정하는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "지정한 커밋� 합치는� autosquash 형� 메시지를 사용합니다"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "커밋� 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같� 사용)"
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "Signed-off-by: 줄� 추가합니다"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "지정한 서� 파�� 사용합니다"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "커밋 편집� 강제합니다"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "기본값"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "메시지�서 공백과 #주�� 지�니다"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "커밋 메시지 서�� �태를 �함합니다"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG 서명 커밋"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "커밋 내용 옵션"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "변경� 파�� 모� 커밋합니다"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "지정한 파�� 커밋할 ��스� 추가합니다"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "대화형으로 파�� 추가합니다"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "대화형으로 변경 사항� 추가합니다"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "지정한 파�만 커밋합니다"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "커밋 전 후�와 커밋 메시지 후�를 건너�니다"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "무엇� 커밋할지 표시합니다"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "바로 앞 커밋� 바꿉니다"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "다시쓰기 후 후�를 건너�니다"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "빈 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "빈 메시지와 같� 변경 사항� 기�하�� 허용합니다"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "HEAD 커밋� 파싱할 수 없습니다"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��� MERGE_HEAD 파� (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE를 �� 수 없습니다"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "커밋 메시지를 �� 수 없습니다: %s"
 
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "커밋� 중지합니다. 메시지를 편집하지 않았습니다.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "커밋� 중지합니다. 커밋 메시지가 비어 있습니다.\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "커밋� 중지합니다. 메시지를 편집하지 않았습니다.\n"
+
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7551,12 +7664,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local 옵션� 깃 저장소 안�서만 쓸 수 있습니다"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "%s 설정 파�� 만들 수 없습니다"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7566,11 +7679,11 @@ msgstr ""
 "%s�(를) 변경하려면 정규�� 쓰거나, --add �는 --replace-all 옵션�\n"
 "사용하십시오."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "사람� �기 좋� 형�으로 �기를 표시합니다"
 
@@ -7594,47 +7707,47 @@ msgstr "lightweight"
 msgid "annotated"
 msgstr "annotated"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "주� 달린 %s 태그를 사용할 수 없습니다"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "주� 달린 %s 태그� 내장� �름� 없습니다"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "'%s' 태그가 실제 여기 '%s'입니다"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "올바른 오브�트 �름� 아닙니다 (%s)"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s�(는) 올바른 '%s' 오브�트가 아닙니다"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "어떤 태그� '%s'와(과) 정확히 �치하지 않습니다"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "%s 설명� 위해 검색하는 중\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "%s�서 검색 마침\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7643,7 +7756,7 @@ msgstr ""
 "어떤 주� 달린 태그� '%s'�(를) 설명하지 않습니다.\n"
 "하지만 주� 달리지 않� 태그가 있습니다: --tags 옵션� 해 보십시오."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7652,12 +7765,12 @@ msgstr ""
 "어떤 태그� '%s'�(를) 설명할 수 없습니다.\n"
 "--always 옵션� � 보거나, 태그를 만들어 보십시오."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "커밋 %lu개를 가로질렀습니다\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7666,75 +7779,75 @@ msgstr ""
 "태그를 %i개 넘게 찾았습니다. 가장 최근� %i개 목��\n"
 "표시합니다. %s 위치�서 검색� 중지합니다.\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "커밋 다�� 오는 태그를 찾습니다"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "표준 오류�서 검색 전략� 디버깅합니다"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "모든 레�런스를 사용합니다"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "모든 태그를, 주� 달리지 않� 태그까지 사용합니다"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "항� 긴 형�� 사용합니다"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "첫 번째 �전 커밋만 따�갑니다"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "정확히 �치하는 항목만 출력합니다"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "<n>개� 가장 최근� 태그만 고려합니다 (기본값: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "<패턴>과 �치하는 태그만 고려합니다"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "<패턴>과 �치하는 태그를 고려하지 않습니다"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "대안으로 요약한 커밋 오브�트를 표시합니다"
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "표시"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "변경� 작업 ��� <표시>를 뒤� 붙입니다 (기본값: \"-dirty\")"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "�가진 작업 ��� <표시>를 뒤� 붙입니다 (기본값: \"-broken\")"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 옵션� --abbrev=0 옵션과 호환�지 않습니다"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "�름� 없습니다. 아무것� 설명할 수 없습니다."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 옵션� 커밋같� 항목과 호환�지 않습니다"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 옵션� 커밋같� 항목과 호환�지 않습니다"
 
@@ -7748,21 +7861,21 @@ msgstr "'%s': �반 파��나 심볼릭 ��가 아닙니다"
 msgid "invalid option: %s"
 msgstr "잘못� 옵션: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "깃 저장소가 아닙니다"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "잘못� '%s' 오브�트가 주어졌습니다."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "� 개보다 많� 블롭� 주어졌습니다: '%s'"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "처리하지 않� '%s' 오브�트가 주어졌습니다."
@@ -7771,27 +7884,27 @@ msgstr "처리하지 않� '%s' 오브�트가 주어졌습니다."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<옵션>] [<커밋> [<커밋>]] [--] [<경로>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "실패: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "%s 심볼릭 ��를 �� 수 없습니다"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "%s 심볼릭 �� 파�� �� 수 없습니다"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "%2$s 심볼릭 ��� 대한 %1$s 오브�트를 �� 수 없습니다"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7799,72 +7912,72 @@ msgstr ""
 "컴바�드 diff 형�� ('-c' � '--cc') 디렉터리 diff 모드�서는\n"
 "('-d' � '--dir-diff') 지�하지 않습니다."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "� 파�� 수정�었습니다: '%s' � '%s'."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "작업 ��가 남겨져 있습니다."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "임시 파�� '%s'� 있습니다."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "� 파�� 지우거나 복구할 수 있습니다."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.tool` 대신 `diff.guitool`� 사용하십시오"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "전체 디렉터리 diff를 수행합니다"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "diff �구를 실행하기 전� 프롬프트를 표시하지 않습니다"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "dir-diff 모드�서 심볼릭 ��를 사용합니다"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<�구>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "지정한 diff �구를 사용합니다"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "`--tool` 옵션�서 사용할 수 있는 diff �구 목�� 표시합니다"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 "실행한 diff �구가 0� 아닌 코드를 리턴하면 'git-difftool'� �나게 합니다"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<명령>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "diff를 보는 명령어를 사용�가 지정합니다"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "--tool=<�구> 옵션� <�구>가 주어지지 않았습니다"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "--extcmd=<명령> 옵션� <명령>� 주어지지 않았습니다"
 
@@ -7872,231 +7985,231 @@ msgstr "--extcmd=<명령> 옵션� <명령>� 주어지지 않았습니다"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-옵션]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "오브�트 <n>개 뒤� 진행 �황� 표시합니다"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "서명한 태그� 처리 방�� 선�합니다"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "필터�한 오브�트� 대한 태그� 처리 방�� 선�합니다"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "� 파�로 표시를 내보냅니다"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "� 파��서 표시를 가져옵니다"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "태그� 태그붙� 사람� 없� 때 가짜로 만듭니다"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "커밋 마다 전체 트리를 출력합니다"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "스트림� �내는� 완료 기능� 사용합니다"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "블롭 ��터� 출력� 건너�니다"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "레�런스명세"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "레�런스명세를 내보낸 레�런스� �용합니다"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "출력� �명화합니다"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<옵션>] [<저장소> [<레�런스명세>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<옵션>] <그룹>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<옵션>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "모든 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "�어쓰지 �고 .git/FETCH_HEAD� �붙입니다"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "리모트 쪽� 묶�� 업로드할 경로"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "로컬 브랜치를 강제로 �어�니다"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "여러 리모트�서 가져옵니다"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "모든 태그와 관련 오브�트를 가져옵니다"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "병렬�으로 받아오는 하위모듈 개수"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "리모트� �제 없는 리모트 추� 브랜치를 잘�냅니다"
 
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "주문형"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "하위 모듈 재귀�으로 가져오기 방�� 설정합니다"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "다운로드한 묶�� 보존합니다"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "HEAD 레�런스 업��트를 허용합니다"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "얕� 복제� 커밋 내역� 깊게 만듭니다"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "얕� 복제� 커밋 내역� 시간� 기준으로 깊게 만듭니다"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "완전한 저장소로 전환합니다"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "디렉터리"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "하위 모듈 경로 출력� 앞� � 디렉터리를 붙입니다"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "하위 모듈� 재귀�으로 가져올 때 기본값 (설정 파�보다 낮� 우선 순위)"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr ".git/shallow를 업��트하는 레�런스를 허용합니다"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "레�런스맵"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "레�런스맵 가져오기를 지정합니다"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "리모트 레�런스 HEAD를 찾� 수 없습니다"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "fetch.output 설정� 잘못� 값� 있습니다: %s"
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "%s 오브�트가 없습니다"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[최신 �태]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[거부�]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "현재 브랜치�서 가져올 수 없�"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[태그 업��트]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "로컬 레�런스를 업��트할 수 없습니다"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[새로운 태그]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[새로운 브랜치]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[새로운 레�런스]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "강제 업��트"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "정방향 진행� 아님"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s�(가) 모든 필요한 오브�트를 보내지 않았습니다\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "얕� 최�위� 업��트가 허용�지 않으므로 %s�(를) 거부합니다"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "%.*s URL�서\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8105,55 +8218,55 @@ msgstr ""
 "업��트할 수 없는 로컬 레�런스가 있습니다. 과거 충� 브랜치를\n"
 " 제거하려면 'git remote prune %s' 명령� 실행해 보십시오"
 
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s 레�런스가 연결� �어지게 �니다)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s 레�런스가 연결� �어졌습니다)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[삭제�]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(없�)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "간략한 저장소가 아닌 저장소� 현재 %s 브랜치로 가져오기를 거절합니다"
 
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "\"%s\" 옵션� \"%s\" 값� %s� 대해 올바르지 않습니다"
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "\"%s\" 옵션� '%s'� 대해 무시�니다\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "'%s'�서 가져오는 방법� 알 수 없습니다"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "%s�(를) 가져오는 중\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "%s�(를) 가져올 수 없습니다"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8161,41 +8274,41 @@ msgstr ""
 "리모트 저장소를 지정하지 않았습니다. 새 리비전� 가져올 수 있는\n"
 "URL�나 리모트 �름� 지정하십시오."
 
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "태그 �름� 지정해야 합니다."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen 옵션� �수 깊�는 지�하지 않습니다"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth � --unshallow 옵션� 같� 쓸 수 없습니다"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 "완전한 저장소� 대해 --unshallow 옵션� 사용하는 건 앞뒤가 맞지 않습니다"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 명령� 저장소 ��가 없습니다"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 명령� 레�런스명세 ��와 같� 쓰면 앞뒤가 맞지 않습니다"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "그런 리모트나 리모트 그룹� 없습니다: %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "그룹� 가져오고 레�런스명세를 지정하면 앞뒤가 맞지 않습니다"
 
@@ -8205,23 +8318,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파�>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "shortlog�서 최대 <n>개 로그를 표시합니다"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "--log와 �� (없어질 예정)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "�스트"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "<�스트>를 시작 메시지로 사용합니다"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "�어들� 파�"
 
@@ -8261,101 +8374,105 @@ msgstr "티�� �합하게 플레�스홀�를 �용합니다"
 msgid "show only <n> matched refs"
 msgstr "<n>개� 해당하는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "�맷 색� 유지합니다"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "주어진 오브�트를 가리키는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "병합하는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "병합하지 않는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "커밋� 들어 있는 레�런스만 표시합니다"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "커밋� 들어 있지 않� 레�런스만 표시합니다"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "오브�트 디렉터리를 확�하는 중입니다"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<옵션>] [<오브�트>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "접근할 수 없는 오브�트를 표시합니다"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "연결� �어진 오브�트를 표시합니다"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "태그를 알립니다"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "최�위 노드를 알립니다"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "��스 오브�트 헤드 노드를 만듭니다"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "묶�과 보조 오브�트� 만듭니다"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "연결만 확�합니다"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "� 엄격하게 확�합니다"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr ".git/lost-found 안� 연결� �어진 오브�트를 �니다"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "진행 �황� 표시합니다"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "접근할 수 없는 오브�트� �름� �세히 표시합니다"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "오브�트를 확�합니다"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<옵션>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "'%s'� fstat()하는� 실패했습니다: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "'%s'� stat()할 수 없습니다"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8370,43 +8487,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "레�런스하지 않는 오브�트를 잘�냅니다"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "� �세히 검사합니다 (실행 시간 늘어남)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "�� 가비지컬렉터 모드를 사용합니다"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 msgid "force running gc even if there may be another gc running"
 msgstr "�미 가비지컬렉터가 실행 중���� 강제로 가비지컬렉터를 실행합니다"
 
-#: builtin/gc.c:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "gc.logexpiry 값� (%s) 파싱하는� 실패했습니다"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "최� 성능� 위해 백그�운드�서 ��으로 저장소� 묶�� 만듭니다.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "최� 성능� 위해 ��으로 저장소� 묶�� 만듭니다.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "수� 관리 작업� \"git help gc\" 내용� 참고하십시오.\n"
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8414,7 +8531,7 @@ msgstr ""
 "가비지컬렉터가 �미 '%s' 컴퓨터�서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
 "force를 사용하십시오)"
 
-#: builtin/gc.c:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8424,12 +8541,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: 스레드를 만드는� 실패했습니다: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "잘못� 스레드 수를 %2$s� 대해 지정했습니다 (%1$d)"
@@ -8438,250 +8555,242 @@ msgstr "잘못� 스레드 수를 %2$s� 대해 지정했습니다 (%1$d)"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "스레드 기능� 없습니다. %s 무시"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "트리를 �� 수 없습니다 (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "종류가 %s� 오브�트�서 grep� 할 수 없습니다"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "`%c' 옵션�는 숫� 값� 와야 합니다"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "작업 �� 대신� ��스�서 검색합니다"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "깃으로 관리하지 않� 내용�서 찾습니다"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "추��는 파�과 추��지 않는 파� 모��서 검색합니다"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "'.gitignore'로 지정한 파�� 무시합니다"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "� 하위 모듈� 재귀�으로 검색합니다"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "베�스�름"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "프로�트� 베�스�므� 출력 앞� 붙입니다"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "�치하지 않는 줄� 표시합니다"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "대소문� 구별하지 않고 비�합니다"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "단어 경계 부분� 대해서만 패턴� 맞춥니다"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "바�너리 파�� �스트로 처리합니다"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "바�너리 파��서 패턴� 맞추지 않습니다"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "textconv 필터를 사용해 바�너리 파�� 처리합니다"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "최대 <깊�> 단계만� 내려갑니다"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "POSIX 확장 정규�� 사용합니다"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "기본 POSIX 정규�� 사용합니다 (기본값)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "패턴� 고정 문�열로 해�합니다"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "펄과 호환�는 정규�� 사용합니다"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "줄 번호를 표시합니다"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "파� �름� 표시하지 않습니다"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "파� �름� 표시합니다"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "파� �름� 최�위 디렉터리 �대 경로로 표시합니다"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 파� �름만 표시합니다"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "--files-with-matches 옵션과 ��"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "�치하지 않는 파�� �름만 표시합니다"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "파� �름 다�� NUL� 출력합니다"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "�치하는 줄� 표시하지 않고 �치하는 수를 표시합니다"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "�치하는 부분� 강조합니다"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "다른 파� 사�� �치하는 부분� 사�� 빈 줄� 출력합니다"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 msgid "show filename only once above matches from same file"
 msgstr "같� 파��서 여러 개가 �치하면 파� �름� 한 번만 표시합니다"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "�치하는 부분 앞뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "�치하는 부분 앞� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "�치하는 부분 뒤� 컨�스트를 <n>줄 표시합니다"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "<n>개� 작업 스레드를 사용합니다"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "-C NUM 옵션� 줄임"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "�치 항목 앞� 함수 �름 줄� 표시합니다"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "들어 있는 함수를 표시합니다"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "파��서 패턴� �습니다"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "<패턴>과 �치"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "-e 옵션으로 지정한 패턴� 결합합니다"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "출력하지 않고 �치하는 항목� exit() �태 번호로 리턴합니다"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr "모든 패턴과 �치하는 파�� �치하는 부분만 표시합니다"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "grep 표현�� 대한 파싱 트리를 표시합니다"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "페�저"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "�치하는 파�� 페�저 프로그램�서 표시합니다"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "grep(1) 실행� 허용합니다 (� 빌드�서는 무시)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "패턴� 지정하지 않았습니다."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index �는 --untracked 옵션� 리비전과 같� 쓸 수 없습니다"
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "리비전� 찾아낼 수 없습니다: %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "잘못� 스레드 수를 지정했습니다 (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "스레드 기능� 없습니다. --threads 옵션 무시"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 옵션� 작업 ���서만 �작합니다"
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "--recurse-submodules와 같� 지�하지 않는 옵션입니다."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "--cached �는 --untracked 옵션� --no-index 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard 옵션� 추��는 내용� 대해 쓸 수 없습니다."
 
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "--cached 옵션과 트리를 모� 지정했습니다."
 
@@ -8772,12 +8881,12 @@ msgstr "emacsclient 버전 파싱� 실패했습니다."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient '%d' 버전� 너무 과거 (< 22) 버전입니다."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "실행 실패: '%s'"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8786,7 +8895,7 @@ msgstr ""
 "'%s': 지�하지 않는 맨 페�지 보기 프로그램 경로.\n"
 "대신� 'man.<�구>.cmd' 옵션� 사용해 보십시오."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8795,345 +8904,345 @@ msgstr ""
 "'%s': 지�하지 않는 맨 페�지 보기 프로그램 명령.\n"
 "대신� 'man.<�구>.path' 옵션� 사용해 보십시오."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': 알 수 없는 맨 페�지 보기 프로그램."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "요청� 처리한 맨 페�지 보기 프로그램� 없습니다"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "요청� 처리한 �� 페�지 보기 프로그램� 없습니다"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "경로마다 �성 정�하기"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "매�매� 사용하는 20개 내외� 깃 명령"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "깃 용어 사전"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "���으로 추�하지 않는 파�� 무시하게 지정하기"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "하위 모듈 �성 정�하기"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "깃� 리비전 � 범위를 지정하기"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "깃 따�하기 안내서 (버전 1.5.1 �후)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "추천하는 깃 활용 작업 순서� 개요"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "�주 사용하는 깃 안내서는 다�과 같습니다:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 명령� `%s' 명령� 단축입니다"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 명령� '%s' 명령� 단축입니다"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "사용법: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "%s�(를) 열 수 없습니다"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "오브�트 종류가 맞지 않습니다 (%s)"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "예�한 %s 오브�트를 받지 않았습니다"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "%s 오브�트: 예�한 종류 %s, 실제 %s"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "%d 바�트를 채울 수 없습니다"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "너무 빨리 파�� �남"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "입력� �기 오류"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "있는 바�트보다 � 많� 사용합니다"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 msgid "pack too large for current definition of off_t"
 msgstr "현재 정�� off_t� 비해 묶�� 너무 �니다"
 
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "묶� �기가 최대 허용 �기를 넘었습니다"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "'%s'�(를) 만들 수 없습니다"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "'%s' 묶� 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "묶� 서명� 맞지 않습니다"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "묶�� %<PRIu32> 버전� 지�하지 않습니다"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "묶�� %<PRIuMAX> 오프셋� 잘못� 오브�트가 있습니다: %s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate가 %d번� 리턴했습니다"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "�타 베�스 오브�트� 대해 오프셋 값� 오버플로우"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "�타 베�스 오프셋� 범위를 벗어났습니다"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "알 수 없는 오브�트 종류 %d번"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "묶� 파�� 대해 pread를 할 수 없습니다"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "심�한 inflate 부조화"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 충�� %s�서 발견�었습니다!"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "%s�(를) �� 수 없습니다"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "기존 %s 오브�트 정보를 �� 수 없습니다"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "기존 %s 오브�트를 �� 수 없습니다"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "잘못� 블롭 오브�트 %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "잘못� %s"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "오브�트� 오류"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s� 모든 하위 오브�트� 접근할 수 없습니다"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "�타를 �용하는� 실패했습니다"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "오브�트를 받는 중"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "오브�트 ��스를 만드는 중"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "묶�� ���었습니다 (SHA1 �치하지 않�)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "묶� 파�� 대해 fstat()할 수 없습니다"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "묶�� �� 쓰레기 ��터가 있습니다"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects()�서 극심한 혼란"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "�타를 알아내는 중"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "스레드를 만들 수 없습니다: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "극심한 혼란"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "로컬 오브�트 %d개 마침"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "%s� 대해 예�치 못한 테� 체�섬 (디스� ��?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "묶�� 알아내지 못한 �타 %d개가 있습니다"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "추가한 오브�트를 deflate할 수 없습니다 (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "%s 로컬 오브�트가 ���었습니다"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "묶� 파�� 닫는� 오류"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "'%s' 보존 파�� 쓸 수 없습니다"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "쓴 '%s' 보존 파�� 닫지 못했습니다"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "묶� 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "��스 파�� 저장할 수 없습니다"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "잘못� pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "기존 '%s' 묶� 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "'%s'� 대한 기존 묶� idx 파�� 열 수 없습니다"
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "�타 아님: 오브�트 %d개"
 
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "체� 길� = %d: 오브�트 %lu개"
 
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "'%s' 묶�파� �름� '.pack'으로 �나지 않습니다"
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "잘못� %s"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 옵션� --stdin 옵션과 같� 쓸 수 없습니다"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin 옵션� 깃 저장소가 필요합니다"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "--verify 옵션� 묶�파� �름� 지정하지 않았습니다"
 
@@ -9265,132 +9374,164 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <토�>[(=|:)<"
 "값>])...] [<파�>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "파�� �접 편집합니다"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "빈 트레�러를 잘�냅니다"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "새 트레�러를 놓� 위치"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "트레�러가 �미 있� 때 �작"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "트레�러가 없� 때 �작"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "트레�러만 출력합니다"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "설정 규칙� �용하지 않습니다"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "공백으로 계�� 값� 연결합니다"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "파싱 옵션 설정"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "트레�러"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "추가할 트레�러"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 옵션과 --only-input 옵션� 앞뒤가 맞지 않습니다"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "파� �접 편집� 입력 파�� 지정하지 않았습니다"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<옵션>] <오브�트>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "잘못� --decorate 옵션: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "diff를 출력하지 않습니다"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "소스를 표시합니다"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "메� 맵 파�� 사용합니다"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "꾸미기 옵션"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 msgid "Process line range n,m in file, counting from 1"
 msgstr "파��서 n,m 범위� 줄� 처리합니다 (1부터 시작)"
 
-#: builtin/log.c:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "최종 출력: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 잘못� 파�"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "%s 오브�트를 �� 수 없습니다"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "알 수 없는 종류: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers 설정� 값� 없�"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "출력 디렉터리� �름� 너무 �니다"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "%s 패치 파�� 열 수 없습니다"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "정확히 하나� 범위가 필요합니다."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "범위가 아닙니다."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "커버레터는 전�메� 형��어야 합니다"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "정신나간 in-reply-to 헤�: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<옵션>] [<시작시�> | <리비전-범위>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "출력 디렉터리가 �개?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "알 수 없는 커밋 %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "'%s'�(를) 올바른 레�런스로 알아내는� 실패했습니다."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "정확한 병합 기준�� 찾� 수 없습니다."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9401,218 +9542,226 @@ msgstr ""
 "아니면 �접 '--base=<기준�-커밋-ID>' 옵션으로 기준� 커밋� 지정할\n"
 "수� 있습니다."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "정확한 병합 기준�� 찾는� 실패했습니다"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "기준� 커밋� 리비전 목�� �위 커밋�어야 합니다"
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "기준� 커밋� 리비전 목�� 들어 있으면 안 �니다"
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "패치 ID를 알아낼 수 없습니다"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "하나� 패치� 대해서� [PATCh n/m]� 붙입니다"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "여러 개 패치� 대해서� [PATCH]를 붙입니다"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "패치를 표준 출력으로 표시합니다"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "커버레터를 만듭니다"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "출력 파� �름� 간단한 �련 번호를 사용합니다"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "확장�"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' 대신 <확장�>를 사용합니다"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "패치 번호를 1 대신 <n>�서 시작합니다"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "시리즈를 N번째 re-roll로 표시합니다"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] 대신 [<접�어>]를 사용합니다"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "결과 파�� <디렉터리>� 저장합니다"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]를 �르거나 추가하지 않습니다"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "바�너리 diff를 만들지 않습니다"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "From 헤��서 모� 0� 해시를 출력합니다"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "업스트림� 있는 패치를 �함하지 않습니다"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr "기본값 (패치 + 통계) 대신 패치 형�� 표시합니다"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "메시징"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "헤�"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "전�메� 헤�"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "전�메�"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "To: 헤�를 추가합니다"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "Cc: 헤�를 추가합니다"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "신�"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "<신�>�서 From 주소를 설정합니다 (없으면 커미터 주소 신� 사용)"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "메시지-ID"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "첫 메�� <메시지-ID>� 대한 답장 메�로 만듭니다"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "경계"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "패치를 첨부합니다"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "패치를 본문� �함합니다"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "메시지� 스레드를 사용, 스타�: shallow, deep"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "서명"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "서명� 추가합니다"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "베�스-커밋"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "전제조건 트리 정보를 패치 시리즈� 추가합니다"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "파��서 서명� 추가합니다"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "패치 파� �름� 표시하지 않습니다"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "패치를 만드는 �안 진행률� 표시합니다"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "잘못� 신� 줄: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc � -k 옵션� 하나만 �야 합니다."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check 옵션� 앞뒤가 맞지 않습니다"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "표준 출력�나 디렉터리 중� 하나만 지정해야 합니다."
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "'%s' 디렉터리를 만들 수 없습니다"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' 서명 파�� �� 수 없습니다"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "패치 �성"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "출력 파�� 만드는� 실패했습니다"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9620,103 +9769,103 @@ msgstr ""
 "추��는 리모트 브랜치를 찾� 수 없습니다. <업스트림>� 수�으로 지정하십시"
 "오.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<옵션>] [<파�>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "파� �태를 태그와 같� 표시합니다"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "'변경�지 않았다고 가정' 파�� 소문�를 사용합니다"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "출력� �시� 파�� 표시합니다 (기본값)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "출력� 삭제� 파�� 표시합니다"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "출력� 수정� 파�� 표시합니다"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "출력� 기타 파�� 표시합니다"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "출력� 무시� 파�� 표시합니다"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "출력� 커밋 표시� 내용� 오브�트 �름� 표시합니다"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "파� 시스템�서 제거해야 하는 파�� 표시합니다"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "기타 디렉터리� �름만 표시합니다"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "파�� 줄 �� 표시합니다"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "빈 디렉터리 표시하지 않기"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "출력� 병합하지 않� 파�� 표시합니다"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "resolve-undo 정보를 표시합니다"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "패턴� �치하는 파�� 건너�니다"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "제외할 패턴� <파�>�서 �습니다"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "<파�>�서 추가�� 디렉터리별 제외 패턴� �습니다"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "표준 깃 제외 패턴� 추가합니다"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "최�위 디렉터리 �대 경로로 출력합니다"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "하위 모듈� 재귀�으로 �용"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "<파�>� ��스 안� 없으면 오류로 취급합니다"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "트리-따위"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "디버깅 ��터를 표시합니다"
 
@@ -9807,177 +9956,181 @@ msgstr "전체 트리 목� 표시, 현재 디렉터리만 아니� (--full-na
 msgid "empty mbox: '%s'"
 msgstr "빈 mbox: '%s'"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<옵션>] [<커밋>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "`m' 옵션�는 값� 필요합니다"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "'%s' 병합 전략� 찾� 수 없습니다.\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "사용 가능한 전략�:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "사용 가능한 사용� 설정 전략�:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시하지 않습니다"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "병합� �날 때 diffstat� 표시합니다"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(--stat 옵션과 ��)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "병합 커밋� 메시지� shortlog 항목� (최대 <n>개) 추가합니다"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "병합하는 대신 하나� 커밋� 만듭니다"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "병합� 성공하면 커밋� 합니다 (기본값)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "커밋 전� 메시지를 편집합니다"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "정방향 진행� 허용합니다 (기본값)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "정방향 진행� 불가능하면 중지합니다"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "지정한 커밋� 올바른 GPG 서명� 있는지 검�합니다"
 
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "ì „ëžµ"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "사용할 병합 전략"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "옵션=값"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "선�한 병합 전략� 대한 옵션"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "병합 커밋 메시지 (정방향� 아닌 병합� 대해)"
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "현재 진행 중� 병합� 중지합니다"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "현재 진행 중� 병합� 계�합니다"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "관계 없는 커밋 내역� 병합� 허용합니다"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "커밋 메시지 후�를 검�합니다"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "stash를 실행할 수 없습니다."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "스태시 실패"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "올바른 오브�트가 아닙니다: %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree 실패"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (합칠 내용� 없습니다)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "커밋 합치기 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "병합 메시지가 없습니다 -- HEAD를 업��트하지 않습니다\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s'�(가) 커밋� 가리키지 않습니다"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "잘못� branch.%s.mergeoptions 문�열: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "� 개� 헤드 병합 외�는 처리하지 않습니다."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive� 대해 알 수 없는 옵션: -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "%s� 쓸 수 없습니다"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "'%s'�서 �� 수 없습니다"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "병합� 커밋하지 않습니다. 병합� 마치려면 'git commit'� 사용하십시오.\n"
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9993,68 +10146,68 @@ msgstr ""
 "'%c' 문�로 시작하는 줄� 무시�고, 메시지가 비어 있으면 커밋�\n"
 "중지합니다.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "빈 커밋 메시지."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "훌륭합니다.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�� 병합� 실패했습니다. 충�� 바로잡고 결과물� 커밋하십시오.\n"
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "현재 브랜치가 없습니다."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "현재 브랜치� 대한 리모트가 없습니다."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr "현재 브랜치� 대해 기본 업스트림� 지정하지 않았습니다."
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "리모트 %2$s�서 %1$s� 대한 리모트 추� 브랜치가 없습니다"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "잘못� 값 '%s', 환경 '%s'"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "%s 안�서 병합할 수 있는 항목� 아닙니다: %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "병합할 수 있는 항목� 아닙니다"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort 옵션� ��를 받지 않습니다"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "중지할 병합 작업� 없습니다. (MERGE_HEAD가 없�)"
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue 옵션� ��를 받지 않습니다"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "진행 중� 병합 작업� 없습니다. (MERGE_HEAD가 없�)"
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10062,7 +10215,7 @@ msgstr ""
 "병합� 마치지 않았습니다. (MERGE_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10070,112 +10223,112 @@ msgstr ""
 "커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있�)"
 
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "--squash 옵션� --no-ff 옵션과 같� 쓸 수 없습니다."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "커밋� 지정하지 않았고  merge.defaultToUpstream를 설정하지 않았습니다."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "빈 헤드로 커밋� 합치기는 지�하지 않습니다"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "정방향� 아닌 커밋� 빈 헤드�서는 앞뒤가 맞지 않습니다"
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 병합할 수 있는 항목� 아닙니다"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 msgid "Can merge only exactly one commit into empty head"
 msgstr "빈 헤드�는 정확히 하나� 커밋만 병합할 수 있습니다"
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "%s 커밋� 신뢰하지 않는 (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "%s 커밋� 잘못� (서명�가 %s�고 하는) GPG 서명� 있습니다."
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "%s 커밋� GPG 서명� 없습니다."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "%s 커밋� %s� 올바른 GPG 서명� 없습니다\n"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "관계 없는 커밋 내역� 병합� 거부합니다"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "�미 업��트 �태입니다."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "업��트 중 %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "아주 간단한 ��스 내부 병합� 시�합니다...\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "아님.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "�미 업��트 �태입니다. 야호!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "정방향� 불가능하므로, 중지합니다."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "트리를 본래 위치로 ��립니다...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "병합 전략 %s 시�...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "병합� 처리한 전략� 없습니다.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "전략 %s(으)로 병합� 실패했습니다.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "수� 해결� 준비를 위해 %s 전략� 사용합니다.\n"
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�� 병합� 잘 진행�었습니다. 요청한대로 커밋 전� 중지합니다\n"
@@ -10315,7 +10468,7 @@ msgstr "git mv [<옵션>] <�본>... <대�>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "%s 디렉터리가 ��스� 있고 하위 모듈� 없습니다?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "계�하려면 .gitmodules� 변경 사항� 스테�지� 넣거나 스태시 하십시오"
 
@@ -10332,68 +10485,68 @@ msgstr "대ìƒ�ì�´ ì�´ë¯¸ 있어ë�„ 강제로 옮기기/ì�´ë¦„ 바꾸기를 í•©ë‹
 msgid "skip move/rename errors"
 msgstr "옮기기/�름 바꾸기 오류를 건너 �니다"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "대�� ('%s') 디렉터리가 아닙니다"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "'%s'�(를) '%s'(으)로 �름 바꾸기합니다\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "잘못� �본"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "디렉터리를 �기 �신으로 옮길 수 없습니다"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "디렉터리를 파�로 옮길 수 없습니다"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "�본 디렉터리가 비어 있습니다"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "버전 컨트롤 중� 아닙니다"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "대�� 있습니다"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "'%s' �어쓰기"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "�어쓸 수 없습니다"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "��한 대�� 대해 여러 개 �본"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "대� 디렉터리가 없습니다"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, �본=%s, 대�=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�름 바꾸기, '%s'�서 '%s'(으)로\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "'%s'� �름 바꾸기가 실패했습니다"
@@ -10584,19 +10737,19 @@ msgstr "노트 오브�트를 쓸 수 없습니다"
 msgid "the note contents have been left in %s"
 msgstr "노트 내용� %s� 남습니다"
 
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "'%s'�(를) �� 수 없습니다"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s'�(를) 열거나 �� 수 없습니다"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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'�(를) 올바른 레�런스로 알아내는� 실패했습니다."
@@ -10624,47 +10777,47 @@ msgstr "'%s'�서 '%s'(으)로 노트를 복사하는� 실패했습니다"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "%s�서 노트를 %s 하기를 거부합니다 (refs/notes/ 밖임)"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "파�미터가 너무 많습니다"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "%s 오브�트� 대해 노트가 없습니다."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "문�열로 노트 내용"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "파� 안� 노트 내용"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "지정한 노트 오브�트를 재사용하고 편집합니다"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "지정한 노트 오브�트를 재사용합니다"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "빈 노트 저장� 허용합니다"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "기존 노트를 바꿉니다"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10673,29 +10826,29 @@ msgstr ""
 "노트를 추가할 수 없습니다. %s 오브�트� 대한 기존 노트가 있습니다. 기존 노트"
 "를 �어쓰려면 '-f' 옵션� 사용하십시오"
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "%s 오브�트� 대한 기존 노트를 �어�니다\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "%s 오브�트� 대한 노트를 제거합니다\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "표준 입력�서 오브�트를 �습니다"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "<명령>� 대한 다시쓰기 설정� �어들입니다 (--stdin 옵션 �함)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "파�미터가 너무 �습니다"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10704,12 +10857,12 @@ msgstr ""
 "노트를 복사할 수 없습니다. %s 오브�트� 대한 기존 노트가 있습니다. 기존 노트"
 "를 �어쓰려면 '-f' 옵션� 사용하십시오"
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "�본 %s 오브�트� 대한 노트가 없습니다. 복사할 수 없습니다."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10718,52 +10871,52 @@ msgstr ""
 "-m/-F/-c/-C 옵션� 'edit' 하위 명령� 대해 사용� 권하지 않습니다.\n"
 "대신� 'git notes add -f -m/-F/-c/-C' 명령� 사용하십시오.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL 레�런스 삭제� 실패했습니다"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF 레�런스 삭제� 실패했습니다"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "'git notes merge' 작업트리 제거� 실패했습니다"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL 레�런스 �기� 실패했습니다"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "NOTES_MERGE_PARTIAL�서 커밋� 찾� 수 없습니다."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "NOTES_MERGE_PARTIAL�서 커밋� 파싱할 수 없습니다."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF 알아내기� 실패했습니다"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "노트 병합� 마치는� 실패했습니다"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "알 수 없는 노트 병합 전략 %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "�반 옵션"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "병합 옵션"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10771,46 +10924,46 @@ msgstr ""
 "주어진 전략� 사용해 노트 충�� 해결합니다 (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "병합하지 않� 노트 커밋"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "병합하지 않� 노트를 커밋해 노트 병합� 마칩니다"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "노트 병합 해결 중지"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "노트 병합� 중지합니다"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort, -s/--strategy 옵션� 섞어 쓸 수 없습니다"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "병합할 노트 레�런스를 지정해야 합니다"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "알 수 없는 전략(-s/--strategy): %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "%s 위치로 노트 병합� �미 %s�서 진행중입니다"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "현재 노트 레�런스� (%s) ��를 저장하는� 실패했습니다."
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10821,223 +10974,223 @@ msgstr ""
 "merge --commit' 명령으로 커밋하십시오. �는 'git notes merge --abort' 명령으"
 "로 병합� 중지하십시오.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "%s 오브�트� 노트가 없습니다\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "없는 노트를 제거하려는 시�를 오류가 아닌 것으로 취급합니다"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "표준 입력�서 오브�트 �름� �습니다"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "제거하지 않고, 보여주기만 합니다"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "잘�낸 노트를 알립니다"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "노트-레�런스"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "<노트-레�런스>�서 노트를 사용합니다"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "알 수 없는 하위 명령: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<옵션>...] [< <레�런스목�> | < <오브�트목�>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<옵션>...] <베�스�름> [< <레�런스목�> | < <오브�트목�"
 ">]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "deflate 오류 (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "배트맵 쓰기를 하지 않습니다. 묶�� pack.packSizeLimit 값� 따� 쪼개집니다"
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "오브�트 쓰는 중"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "묶�� 들어있지 않� 오브�트가 있으므로, 비트맵 쓰기를 하지 않습니다"
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "오브�트 압축하는 중"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "지�하지 않는 ��스 버전 %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "잘못� ��스 버전 '%s'"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "진행률� 표시하지 않습니다"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "오브�트 쓰기 단계�서 진행률� 표시합니다"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "진행률� 표시� 때 --all-progress와 비슷합니다"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "버전[,오프셋]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr "지정한 버전� ��스 형�� 따� 묶� ��스 파�� �니다"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "출력 묶� 파�� 최대 �기"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "보조 오브�트 저장소�서 빌려온 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "묶� 오브�트를 무시합니다"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "묶� 윈�우를 오브�트 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr "묶� 윈�우를 오브�트 단위� 추가로 메모리 단위로 제한합니다"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "결과물 묶��서 허용�는 최대 길�� �타 체�"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "기존 �타를 재사용합니다"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "기존 오브�트를 재사용합니다"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA 오브�트를 사용합니다"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 msgid "use threads when searching for best delta matches"
 msgstr "최�� �타 �치를 검색하는� 스레드를 사용합니다"
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "빈 묶� 출력� 만들지 않습니다"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "표준 입력�서 리비전 ��를 �습니다"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 msgid "limit the objects to those that are not yet packed"
 msgstr "묶지 않는 오브�트 수를 제한합니다"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "모든 레�런스�서 접근 가능한 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr "reflog 항목�서 레�런스할 수 있는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "��스�서< 레�런스하는 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "묶�� 표준 출력으로 출력합니다"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr "묶�� 들어갈 오브�트를 레�런스하는 태그 오브�트를 �함합니다"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "접근 불가능 오브�트를 보존합니다"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "�슨한 접근 불가능 오브�트를 묶습니다"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "<시�>보다 새로운 접근 불가능 오브�트� 묶�� 풉니다"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "얇� 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "얕� 가져오기� �합한 묶�� 만듭니다"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "해당하는 .keep 파�� 있는 묶�� 무시합니다"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "묶� 압축 단계"
 
 # FIXME: graft?
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "붙어 있는 커밋� 숨기지 않습니다"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "가능하면 비트맵 ��스를 사용해 오브�트 세기 ��를 높입니다"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "묶� ��스와 같� 비트맵 ��스를 �니다"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "오브�트 개수 세는 중"
 
@@ -11053,11 +11206,11 @@ msgstr "모� 묶습니다"
 msgid "prune loose refs (default)"
 msgstr "�슨한 레�런스를 잘�냅니다 (기본값)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "중복� 오브�트 제거"
 
@@ -11098,7 +11251,7 @@ msgstr "병합 관련 옵션"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "변경 사항� �용할 때 병합하는 대신 리베�스합니다"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "정방향 진행� 허용합니다"
 
@@ -11119,18 +11272,18 @@ msgstr "병렬�으로 풀� 실행할 하위모듈 개수"
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff� 대해 잘못� 값: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "가져온 레�런스 중� 리베�스할 대� 후보가 없습니다."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "가져온 레�런스 중� 병합할 대� 후보가 없습니다."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11138,7 +11291,7 @@ msgstr ""
 "보통 �런 경우는 리모트 쪽�는 없는 와�드카드 레�런스명세가\n"
 "주어졌� 때 �어납니다."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11149,42 +11302,42 @@ msgstr ""
 "� 리모트는 현재 브랜치� 대해 기본으로 설정� 리모트가\n"
 "아니기 때문�, 명령행�서 브랜치를 지정해야 합니다."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "현재 어떤 브랜치 위�� 있지 않습니다."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "어떤 브랜치를 대�으로 리베�스할지 지정하십시오."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "어떤 브랜치를 대�으로 병합할지 지정하십시오."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "�세한 정보는 git-pull(1) 페�지를 참고하십시오."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<리모트>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<브랜치>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "현재 브랜치� 추� 정보가 없습니다."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 "� 브랜치� 대한 추� 정보를 설정하려면 다�과 같� 할 수 있습니다:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11193,27 +11346,27 @@ msgstr ""
 "설정�서 리모트� '%s' 레�런스와 병합하�� 지정했지만,\n"
 "그런 레�런스를 가져오지 않았습니다."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "리베�스� 대해 --verify-signatures 옵션� 무시합니다"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 옵션� --rebase 옵션과 같� �야 합니다."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "만들어지지 않� 브랜치를 ��스� 추가� 변경 사항으로 업��트합니다."
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "리베�스로 풀하기"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "커밋하거나 스태시� 넣으십시오."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11224,7 +11377,7 @@ msgstr ""
 "작업 ��를 %s 커밋�서 정방향\n"
 "진행합니다."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11241,15 +11394,15 @@ msgstr ""
 "$ git reset --hard\n"
 "복구�니다."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "여러 브랜치로 리베�스할 수 없습니다."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "로컬�서 기�한 하위 모듈 수정 사항� �용해 리베�스할 수 없습니다"
 
@@ -11629,19 +11782,47 @@ msgstr "unpack-trees 디버깅"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<옵션>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "빈 커밋� 유지합니다"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "리베�스 계�"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "리베�스를 중지합니다"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "리베�스 스�립트를 만듭니다"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "할 � 목�� SHA-1� 줄입니다"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "할 � 목�� SHA-1� 늘입니다"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "할 � 목�� 확�합니다"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "불필요한 빼오기를 건너�니다"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash 줄 재구성"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11668,7 +11849,7 @@ msgstr ""
 "� 메시지를 보지 않고 기본 �작� 계� 하려면,\n"
 "'receive.denyCurrentBranch' 설정 변수를 'refuse'로 설정하십시오."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -11688,11 +11869,11 @@ msgstr ""
 "\n"
 "� 메시지를 보지 않으려면, � 설정 변수를 'refuse'로 설정하십시오."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "출력 않기"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "디렉터리를 지정해야 합니다."
 
@@ -11842,12 +12023,12 @@ msgstr "--mirror 옵션과 같� 마스터 브랜치를 지정하면 앞뒤가
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "마스터 브랜치를 지정� fetch 미러�서만 앞뒤가 맞습니다"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "%s 리모트가 �미 있습니다."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s'�(는) 올바른 리모트 �름� 아닙니다"
@@ -11870,17 +12051,17 @@ msgstr "(�치)"
 msgid "(delete)"
 msgstr "(삭제)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "그런 리모트가 없습니다: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "설정 섹션� '%s'�서 '%s'(으)로 바꿀 수 없습니다"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11891,17 +12072,17 @@ msgstr ""
 "\t%s\n"
 "\t필요하면 설정� 수�으로 업��트하십시오."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "'%s' 삭제가 실패했습니다"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "'%s' 만들기가 실패했습니다"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11913,113 +12094,113 @@ msgstr[0] ""
 "다.\n"
 "삭제하려면 다�� 사용하십시오:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "설정 섹션 '%s'�(를) 제거할 수 없습니다"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 새 항목 (다� 가져오기는 remotes/%s 아래 저장�니다)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " 추��"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 오래� (제거하려면 'git remote prune'� 사용하십시오)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "잘못� branch.%s.merge 값. 여러 개 브랜치로 리베�스할 수 없습니다"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "리모트 %s 위로 대화�으로 리베�스합니다"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "리모트 %s 위로 리베�스합니다"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " 병합: 리모트 %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "병합: 리모트 %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    그리고 리모트 %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "만들기"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "삭제"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "최신 �태"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "정방향 진행 가능"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "로컬� 뒤떨어�"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s�서 %-*s(으)로 강제 (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s�서 %-*s(으)로 푸시 (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s�서 %s(으)로 강제"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s�서 %s(으)로 푸시"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "리모트� 질�하지 않습니다"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* 리모트 %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  가져오기 URL: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(URL 없�)"
 
@@ -12027,182 +12208,182 @@ msgstr "(URL 없�)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  푸시  URL: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 브랜치: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(질�하지 않�)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(알 수 없�)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 브랜치 (리모트 HEAD는 애매하고, 다� 중 하나� 수 있습니다):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  리모트 브랜치:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (�태를 질�하지 않�)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  'git pull'� 사용할 로컬 브랜치를 설정:"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  로컬 레�런스를 'git push'로 미러�할 예정"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  로컬 레�런스를 'git push'로 미러�%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "레�런스/리모트/<�름>/HEAD 값� 리모트� 맞게 설정합니다"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "레�런스/리모트/<�름>/HEAD 값� 삭제합니다"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "리모트 HEAD를 결정할 수 없습니다"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "리모트 HEAD 브랜치가 여러개입니다. 다� 중 하나를 명시�으로 지정하십시오:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "%s�(를) 삭제할 수 없습니다"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "올바른 레�런스가 아닙니다: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "%s�(를) 설정할 수 없습니다"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s� 연결� �어집니다!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s� 연결� �어졌습니다!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "잘�냄: %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [잘�낼 예정] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [잘�냄] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "가져온 후� 리모트를 잘�냅니다"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "그런 리모트가 없습니다 ('%s')"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "브랜치를 추가합니다"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "리모트를 지정하지 않았습니다"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "가져오기 URL� 아니� 푸시 URL� 질�합니다"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "모든 URL� 리턴합니다"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "'%s' 리모트� 대한 URL� 설정하지 않았습니다"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "푸시 URL� 지정합니다"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "URL� 추가합니다"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "URL� 삭제합니다"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 옵션� 둘다 쓰면 안 �니다"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "잘못� 오래전 URL 패턴: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "그런 URL� 없습니다: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "푸시용� 아닌 모든 URL� 삭제하지 않습니다"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "�세히 표시합니다 (하위 명령 앞� 와야 합니다)"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "알 수 없는 하위 명령: %s"
@@ -12300,7 +12481,7 @@ msgstr "precious-objects 저장소� 묶�� 삭제할 수 없습니다"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable � -A 옵션� 호환�지 않습니다"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "'%s' 제거� 실패했습니다"
@@ -12432,121 +12613,121 @@ msgstr "병합"
 msgid "keep"
 msgstr "유지"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "올바른 HEAD가 없습니다."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "HEAD� 트리를 찾는� 실패했습니다."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "%s� 트리를 찾는� 실패했습니다."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD� 현재 위치는 %s입니다"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "병합 중� %s 리셋� 할 수 없습니다."
 
-#: builtin/reset.c:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "간략히 표시, 오류만 표시합니다"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "HEAD와 ��스를 리셋합니다"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "HEAD만 리셋합니다"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, ��스, 작업��를 리셋합니다"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD를 리셋하지만 로컬 변경 사항� 남겨둡니다"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr "제거한 경로를 나중� 추가한다는 사실만 기�합니다"
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "'%s'�(를) 올바른 리비전으로 찾는� 실패했습니다."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "'%s'�(를) 올바른 트리로 찾는� 실패했습니다."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 옵션� --{hard,mixed,soft} 옵션과 호환�지 않습니다"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed 옵션� 경로와 같� 쓰기는 제거� 예정입니다. 대신� 'git reset -- <경"
 "로>'를 사용하십시오."
 
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "경로와 같� %s 리셋� 할 수 없습니다."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s 리셋� 간략한 저장소�서만 쓸 수 있습니다"
 
-#: builtin/reset.c:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N 옵션� --mixed 옵션과 같� �야만 합니다"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "리셋 뒤� 스테�징하지 않� 변경 사항:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "��스 파�� '%s' 리비전으로 리셋할 수 없습니다."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "새 ��스 파�� 쓸 수 없습니다."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list는 노트 표시를 지�하지 않습니다"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<옵션>] -- [<��>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "��로 넘긴 `--`를 유지합니다"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "첫번째 옵션� 아닌 �� 뒤� 파싱� 중지합니다"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "stuck long 형�으로 출력합니다"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12639,11 +12820,11 @@ msgstr "빈 메시지로 커밋� 허용합니다"
 msgid "keep redundant, empty commits"
 msgstr "여분� 빈 커밋� 유지합니다"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "��리기 실패"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "cherry-pick 실패"
 
@@ -12708,17 +12889,17 @@ msgstr "재귀� 제거를 허용합니다"
 msgid "exit with a zero status even if nothing matched"
 msgstr "아무 것� �치하지 않으면 �태 0번으로 �납니다"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "-r 옵션� 없으면 재귀�으로 '%s'�(를) 제거하지 않습니다"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: %s�(를) 제거할 수 없습니다"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "'%s'�(를) 제거할 수 없습니다"
@@ -12755,27 +12936,27 @@ msgstr "리모트 �움 프로그램� �태를 표시합니다"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<옵션>] [<리비전-범위>] [[--] [<경로>...]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "작성�가 아닌 커미터로 묶습니다"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "작성�별 커밋 수� 따� 정렬합니다"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "커밋 설명� �략하고, 커밋 수만 표시합니다"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "작성�� 전�메� 주소를 표시합니다"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "줄바꿈 출력"
 
@@ -12972,35 +13153,35 @@ msgstr "주� 문�로 시작하는 모든 줄� 건너뛰고 제거합니다
 msgid "prepend comment character and space to each line"
 msgstr "� 줄� 앞� 주� 문�와 공백� 붙입니다"
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "그런 레�런스가 없습니다: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "전체 레�런스 �름� 필요하지만, 입력� %s"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "'%s' URL 하나� 단계를 잘�낼 수 없습니다"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "�대 경로� 사용할 �다른 기준"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ".gitmodules�서 하위 모듈 경로 '%s'� 대한 URL� 없습니다"
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13008,79 +13189,79 @@ msgid ""
 msgstr ""
 "'%s' 설정� 찾아볼 수 없습니다. � 저장소가 �체 업스트림��고 가정합니다."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "하위 모듈 경로 '%s'� 대한 URL� 등�하는� 실패했습니다"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "'%3$s' 경로� 대해 '%1$s' (%2$s) 하위 모듈 등�\n"
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "경고: '%s' 하위 모듈� 대해 커맨드 업��트 모드가 제안�었습니다\n"
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "'%s' 하위 모듈� 대해 업��트 모드 등�� 실패했습니다"
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "하위 모듈 초기화� 출력� 하지 않습니다"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<경로>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <경로>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "경로 '%s'� 대해 .gitmodules� 있는 하위모듈 매핑� 없습니다"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "'%s' 하위 모듈� 보조 오브�트를 추가할 수 없습니다: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "submodule.alternateErrorStrategy� 대한 값�('%s') 알 수 없는 값입니다"
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "submodule.alternateLocation� 대한 값�('%s') 알 수 없는 값입니다"
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "새 하위 모듈� 복제할 대� 위치"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "새 하위 모듈 �름"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "하위 모듈� 복제해 올 URL"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "얕� 복제� 사용할 깊�"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "복제 진행 �황� 항� 표시합니다"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13088,82 +13269,82 @@ msgstr ""
 "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
 ">] [--name <�름>] [--depth <깊�>] --url <url> --path <경로>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "'%s'�서 하위 모듈 경로 '%s'� 복제하는� 실패했습니다"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "'%s'� 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "'%s' 하위 모듈 경로가 초기화�지 않았습니다"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "'update --init'� 하려고 한 것 아니었습니까?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "병합하지 하위 모듈 %s 건너뜀"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "하위 모듈 '%s' 건너뜀"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "'%s' 복제하는� 실패했습니다. 재시� 예정"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "�번째 '%s' 복제하는� 실패했습니다. 중지합니다"
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "작업 ��로 가는 경로"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "작업 ��로 가는 경로, 내장� 하위 모듈� 경계 통과"
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout �는 none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "지정한 개수� 리비전�서 잘린 얕� 복제를 만듭니다"
 
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "병렬 작업 개수"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "최초 복제가 얕� 복제 추천� 따를지 여부"
 
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "복제 과정� 표시하지 않습니다"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "파�미터 업��트� 값� 잘못�었습니다"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13172,20 +13353,20 @@ msgstr ""
 "하위 모듈 (%s) 브랜치가 �위 프로�트 브랜치를 �어받�� 설정�었지만, �위 "
 "프로�트� 브랜치가 없습니다"
 
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "하위 모듈� 재귀�으로 �용"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<경로>...]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s�서 --super-prefix 옵션� 지�하지 않습니다"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s'�(는) 올바른 submodule--helper 하위 명령� 아닙니다"
@@ -13198,23 +13379,23 @@ msgstr "git symbolic-ref [<옵션>] <�름> [<레�런스>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <�름>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "심볼� 아닌 (분리�) 레�런스� 대해 �러 메시지를 표시하지 않습니다"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "심볼릭 레�런스를 삭제합니다"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "레�런스 출력� 줄입니다"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "�유"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "업��트� �유"
 
@@ -13244,17 +13425,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<형�>] <태그�름>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "'%s' 태그가 없습니다."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "'%s' 태그 삭제함 (과거 %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13267,7 +13448,7 @@ msgstr ""
 "  %s\n"
 "'%c' 문�로 시작하는 줄� 무시�니다.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13281,142 +13462,142 @@ msgstr ""
 "  %s\n"
 "'%c' 문�로 시작하는 줄� 유지�니다. 제거하려면 �접 지워야 합니다.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "태그� 서명할 수 없습니다"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "태그 파�� 쓸 수 없습니다"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "잘못� 오브�트 종류."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "태그 메시지 없�?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "태그 메시지가 %s 파�� 남아 있습니다\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "태그 �름 목�� 표시합니다"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "� 태그 메시지� <n>줄� 표시합니다"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "태그를 삭제합니다"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "태그를 검�합니다"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "태그 만들기 옵션"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "주� 달린 태그, 메시지가 필요합니다"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "태그 메시지"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "주� 달리고 GPG 서명한 태그"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "태그를 서명하는� 지정한 키를 사용합니다"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "태그가 있으면 바꿉니다"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "reflog를 만듭니다"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "태그 목� 보기 옵션"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "태그 목�� 여러 열로 표시합니다"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "해당 커밋� 들어 있는 태그만 표시합니다"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "해당 커밋� 들어 있지 않� 태그만 표시합니다"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "병합� 태그만 표시합니다"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "병합�지 않� 태그만 표시합니다"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "해당 오브�트� 태그만 표시합니다"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column � -n 옵션� 호환�지 않습니다"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "-n 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged � --no-merged 옵션� 리스트 모드�서만 허용합니다"
 
-#: builtin/tag.c:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "하나� -F �는 -m 옵션만 쓸 수 있습니다."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "파�미터가 너무 많습니다"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s'�(는) 올바른 태그 �름� 아닙니다."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "태그 '%s'�(가) �미 있습니다"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "태그 '%s' 업��트 (과거 %s)\n"
@@ -13483,128 +13664,128 @@ msgstr "디렉터리를 삭제한 후� 디렉터리 정보가 바뀌지 않았
 msgid " OK"
 msgstr " 오케�"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<옵션>] [--] [<파�>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "��스� 업��트가 필요하��� 새로 고침� 계�합니다"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "새로 고침: 하위 모듈 무시"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "새 파�� 무시할 수 않습니다"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "디렉터리를 파�로, �는 그 반대로 바꿀 수 있게 허용합니다"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "작업���서 알림 파�� 없습니다"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "��스� 병합하지 않� 항목� 있어� 새로 고칩니다"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "파� 정보를 새로 고칩니다"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "--refresh와 ��하지만, assume-unchanged 설정� 무시합니다"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<모드>,<오브�트>,<경로>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "지정한 항목� ��스� 추가합니다"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "파�� \"바꾸지 않�\"으로 표시합니다"
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "바꾸지 않�으로 가정 (assumed-unchanged) 비트를 지�니다"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "파�� ��스 전용으로 (\"index-only\") 표시합니다"
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "작업�� 건너뛰기 (skip-worktree) 비트를 지�니다"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "��스�만 추가합니다. 내용� 오브�트 ��터베�스� 추가하지 않습니다"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr "작업 ��� 있어� 해당 경로를 제거합니다"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "--stdin과 같� 사용: 입력 줄� NUL 바�트로 �납니다"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "표준 입력�서 업��트할 경로� 목�� �습니다"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "표준 입력�서 �� 항목� ��스� 추가합니다"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "경로 목�� 대해 #2 � #3 스테�징� 다시 합니다"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "HEAD와 다른 항목만 업��트합니다"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "작업 ��� 없는 파�� 무시합니다"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "표준 출력� �작� 알립니다"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "저장한 해결�지 않� 충�� 무시합니다 (사용�용 명령 용�)"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "��스를 � 형�으로 �니다"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "스플릿 ��스를 켜거나 �니다"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "추�하지 않는 �시 사용� 켜거나 �니다"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "파� 시스템� 추�하지 않는 �시를 지�하는지 검사합니다"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "파� 시스템 시험 없� 추�하지 않는 �시를 사용합니다"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13612,7 +13793,7 @@ msgstr ""
 "core.splitIndex 값� 거짓입니다. 정�로 스플릿 ��스를 사용하려면 � 값� 제"
 "거하거나 바꾸십시오."
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13620,7 +13801,7 @@ msgstr ""
 "core.splitIndex 값� 참입니다. 정�로 스플릿 ��스를 사용하지 않으려면 � 값"
 "� 제거하거나 바꾸십시오."
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13628,11 +13809,11 @@ msgstr ""
 "core.untrackedCache 값� 참입니다. 정�로 추�하지 않는 �시를 사용하지 않으"
 "려면 � 값� 제거하거나 바꾸십시오."
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "추��지 않는 파� �시를 사용하지 않습니다"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13640,7 +13821,7 @@ msgstr ""
 "core.untrackedCache 값� 거짓입니다. 정�로 추�하지 않는 �시를 사용하려면 "
 "� 값� 제거하거나 바꾸십시오."
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "'%s'� 대해 추��지 않는 �시를 사용하지 않습니다"
@@ -13657,19 +13838,19 @@ msgstr "git update-ref [<옵션>]    <레�런스�름> <새-값> [<과거-값
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<옵션>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "레�런스를 삭제합니다"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "<레�런스�름>� 가리키지 않는 항목으로 업��트합니다"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "표준 입력� NUL로 �나는 ��가 있습니다"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "표준 입력�서 업��트를 �습니다"
 
@@ -13733,102 +13914,109 @@ msgstr "git worktree prune [<옵션>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <경로>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "worktrees/%s 제거: gitdir 파�� 없습니다"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "worktrees/%s 제거: gitdir 파�� �� 수 없습니다 (%s)"
 
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "작업 트리 제거/%s: 부족하게 �� (%<PRIuMAX> 바�트 예�, %<PRIuMAX> 바�트 ��)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "worktrees/%s 제거: gitdir 파�� 올바르지 않습니다"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "worktrees/%s 제거: gitdir 파�� 없는 위치를 가리킵니다"
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "잘�낸 작업 ��를 알립니다"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "<시�>보다 오래 � 작업 ��를 만료합니다"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s'�(가) �미 있습니다"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "'%s'� 디렉터리를 만들 수 없습니다"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "%s 준비 중 (ID %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "다른 작업 ���서 체�아웃했��� <브랜치>를 체�아웃합니다"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "새 브랜치를 만듭니다"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "브랜치를 만들거나 리셋합니다"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "새 작업 ��를 만듭니다"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "새 작업 ��를 잠궈 둡니다"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "잠그는 �유"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s'�(는) 작업 ��가 아닙니다"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "메� 작업 ��를 잠그거나 잠금 해제할 수 없습니다"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s'�(는) �미 잠겼습니다. �유: %s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s'�(는) �미 잠겼습니다"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s'�(는) 잠기지 않았습니다"
@@ -13853,24 +14041,24 @@ msgstr "디버깅 용�로만 사용"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<옵션>] <디렉터리>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "하나� 요청/�답 �환 뒤� �납니다"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "최초 레�런스 알림 뒤� 즉시 �납니다"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "<디렉터리>가 깃 디렉터리가 아니면 <디렉터리>/.git/ ��를 시�하지 않습니다."
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "<n>초 �안 반�� 없으면 전송� 중지합니다"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13883,7 +14071,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "디버깅 메시지를 표준오류로 출력합니다"
 
@@ -13897,21 +14085,21 @@ msgstr ""
 "목�� 볼 수 있습니다. 특정 하위 명령어나 개�� 대해 �어 보려면 'git help\n"
 "<명령>' �는 'git help <개�>' 명령� 실행하십시오."
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer� 0보다 작� 값입니다. 기본값 %d"
 
 # HTTP delegation
-#: http.c:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "딜리게�션 컨트롤� cURL 7.44.0 앞 버전�서는 지�하지 않습니다"
 
-#: http.c:367
+#: http.c:368
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "공개 키 고정� cURL 7.44.0 앞 버전�서는 지�하지 않습니다"
 
-#: http.c:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14273,7 +14461,7 @@ msgstr "$pretty_name(으)로 공통 커밋� 찾� 수 없습니다"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "�미 $pretty_name� 업��트 �태입니다"
 
 #: git-merge-octopus.sh:89
@@ -14292,51 +14480,53 @@ msgstr "간단한 병합ì�´ ë�™ìž‘하지 않습니다. ìž�ë�™ 병합ì�„ ì‹œë�„í•
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"� 문제를 해결하면, \"\"git rebase --continue\"를 실행하십시오.\n"
-"� 패치를 건너뛰려면, 대신� \"git rebase --skip\"� 실행하십시오.\n"
-"�래 브랜치를 체�아웃하고 리베�스를 중지하려면, \"git rebase --abort\"를 실"
-"행하십시오."
+"모든 충�� 수�으로 해결하고, 모� \"git add/rm <충�_파�>\" 명령으로\n"
+"해결했다고 표시하고, \"git rebase --continue\" 명령� 실행하십시오. � 패치를\n"
+"건너뛰려면, 대신� \"git rebase --skip\" 명령� 실행하십시오. 리베�스를\n"
+"중지하고 \"git rebase\" 명령 전� �래 �태로 �아가려면, \"git rebase --abort\"\n"
+"명령� 실행하십시오."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "'$head_name' 위치로 �아갈 수 없습니다"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "��스태시 �용."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "\"$stash_sha1\"�(를) 저장할 수 없습니다"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "리베�스 전 후��서 리베�스를 거부했습니다."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "git-am� 진행 중� 것처럼 보입니다. 리베�스할 수 없습니다."
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "리베�스가 진행 중�지 않습니다"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "--edit-todo �작� 대화형 리베�스�서만 사용할 수 있습니다."
 
-#: git-rebase.sh:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "HEAD를 �� 수 없습니다"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14344,7 +14534,7 @@ msgstr ""
 "모든 병합 충�� 편집하고 git add\n"
 "명령으로 해결�었다고 표시해야 합니다"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14365,101 +14555,101 @@ msgstr ""
 "� 명령� 다시 실행하십시오. 중요한 사항� 남아 있� 경우를\n"
 "대비해 여기서 멈춥니다."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "잘못� 업스트림 $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 여러 개� 병합 베�스가 있습니다"
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 병합 베�스가 없습니다"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "올바른 커밋� 가리키지 않습니다: $onto_name"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "치명� ��: 그런 브랜치가 없습니다: $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "�� 스태시를 할 수 없습니다"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�� 스태시를 만들었습니다: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "커밋하거나 스태시� 넣으십시오."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "현재 브랜치가 ($branch_name) 최신 �태입니다. 강제 리베�스합니다."
 
-#: git-rebase.sh:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "변경 사항 '$mb'�서 '$onto'(으)로:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "작업 사항� 다시 넣기 위해 먼저 헤드를 뒤로 �립니다..."
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear 명령� 파�미터와 같� 쓰기는 구현�지 않았습니다"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "아� 최초 커밋� 없습니다"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "현재 ��스 �태를 저장할 수 없습니다"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "추�하지 않는 파�� 저장할 수 없습니다"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "현재 작업 �� �태를 저장할 수 없습니다"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "변경 사항� 선�하지 않았습니다"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "임시 ��스를 제거할 수 없습니다 (�어날 수 없는 �황)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "작업 �� �태를 기�할 수 없습니다"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "$ref_stash�(를) $w_commit(으)로 업��트할 수 없습니다"
@@ -14474,7 +14664,7 @@ msgstr "$ref_stash�(를) $w_commit(으)로 업��트할 수 없습니다"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14483,108 +14673,108 @@ msgstr ""
 "오류: 'stash save'� 대해 알 수 없는 옵션: $option\n"
 "       메시지를 넘기려면, 다�과 같� 쓰십시오: git stash save -- '$option'"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "--patch 옵션과 --include-untracked �는 --all 옵션� �시� 쓸 수 없습니다"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "저장할 로컬 변경 사항� 없습니다"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "스태시를 초기화할 수 없습니다"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "현재 �태를 저장할 수 없습니다"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "작업 ��와 $stash_msg ��스 �태를 저장했습니다"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "작업�� 변경 사항� 제거할 수 없습니다"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "알 수 없는 옵션: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "스태시 항목� 없습니다."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "너무 많� 리비전� 지정했습니다: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference�(는) 올바른 레�런스가 아닙니다"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args'�(는) 스태시 커밋� 아닙니다"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args'�(는) 스태시 레�런스가 아닙니다"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "��스를 새로 고칠 수 없습니다"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "병합 �중� 스태시를 �용할 수 없습니다"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "��스� 충�. --index 없� 시�해 보십시오."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "��스 트리를 저장할 수 없습니다"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr "스태시 항목�서 추�하지 않는 파�� 복구할 수 없습니다"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "수정한 파�� 스테�지�서 뺄 수 없습니다"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "��스가 스태시�서 빠졌습니다."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
 msgstr "다시 필요할 때를 대비해 스태시 항목� 보관합니다."
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} 지움 ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: 스태시 항목� 지울 수 없습니다"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "브랜치 �름� 지정하지 않았습니다"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
 
@@ -14727,17 +14917,17 @@ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "'$name' 하위 모듈� ($url) '$displaypath' 경로� 대해 등��지 않았습니다"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "하위 모듈 경로�서 ('$displaypath') 현재 리비전� 찾� 수 없습니다"
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "하위 모듈 경로 '$sm_path'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14746,12 +14936,12 @@ msgstr ""
 "하위 모듈 경로 '$sm_path'�서 현재 ${remote_name}/${branch} 리비전� 찾� 수 "
 "없습니다"
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 가져올 수 없습니다"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14760,82 +14950,82 @@ msgstr ""
 "'$displaypath' 하위 모듈 경로�서 가져왔지만, $sha1 커밋� 들어있지 않습니"
 "다. � 커밋� �접 가져오는� 실패했습니다."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 체�아웃할 수 없습니다"
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체�아웃"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1'�(를) 리베�스할 수 없습니다"
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베�스"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "하위 모듈 경로 '$displaypath'�서 '$sha1' 병합할 수 없습니다"
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$sha1'�서 병합"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "'$command $sha1' 실행� 하위 모듈 경로 '$displaypath'�서 실패했습니다"
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "재귀�으로 하위 모듈 경로 '$displaypath'� 들어가는� 실패했습니다"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr "--cached 옵션� --files 옵션과 같� 쓸 수 없습니다"
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "예�치 못한 모드 $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  경고: '$display_name'� '$sha1_src' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  경고: '$display_name'� '$sha1_dst' 커밋� 들어있지 않습니다"
 
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "재귀�으로 하위 모듈 경로 '$sm_path'� 들어가는� 실패했습니다"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "하위 모듈 URL� '$displaypath'� 대해 �기화"
@@ -14854,13 +15044,13 @@ msgstr "리베�스중 ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -14945,48 +15135,48 @@ msgstr "HEAD를 $first_parent 위치로 옮길 수 없습니다"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "병합 squash 거부: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "$sha1 병합� 다시 하는� 오류"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "$sha1� 빼오기 할 수 없습니다"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "커밋 메시지 #${n}번입니다:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "#${n}번째 커밋 메시지를 건너�니다:"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "$fixup_msg를 쓸 수 없습니다"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "커밋 2개가 섞� 결과입니다."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "다�� �용할(apply) 수 없습니다: $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14999,31 +15189,31 @@ msgstr ""
 "대부분� 경우 빈 커밋 메시지 때문�거나, �는 커밋 전 후�가 실패했기\n"
 "때문입니다. 커밋 메시지를 수정하기 전� � 문제를 먼저 해결해야 합니다."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "다��서 멈춥니다: $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "�전 커밋 없� '$squash_style' 수행할 수 없습니다"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "실행 중: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "실행 실패: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 msgid "and made changes to the index and/or the working tree"
 msgstr "그리고 ��스 그리고/�는 작업 ��� 변경 사항� 있습니다"
 
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15034,7 +15224,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15049,95 +15239,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "알 수 없는 명령: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "성공�으로 리베�스했고 $head_name 업��트했습니다."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "불필요한 빼오기 명령� 건너뛸 수 없습니다"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"경고: 다� 줄�서 해당 SHA-1� 없거나 커밋� 아닙니다:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"경고: 다� 줄�서 명령어가 무엇�지 알 수 없습니다:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "HEAD는 분리할 수 없습니다"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"경고: �부 커밋� ��치 않게 버려졌� 수� 있습니다.\n"
-"버려진 커밋 (최근�서 과거 순서):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"� 메시지를 보지 않으려면, \"drop\"� 사용해 명시�으로 커밋� 제거하십시"
-"오.\n"
-"\n"
-"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니"
-"다.\n"
-"가능한 �작�: ignore, warn, error"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"rebase.missingCommitsCheck 옵션� 대해 ��할 수 없는 $check_level 설정. 무시"
-"합니다."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"'git rebase --edit-todo' 명령으로 바로잡� 수 있고 'git rebase --continue' 명"
-"령� 실행합니다."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "아니면 'git rebase --abort' 명령으로 리베�스를 중지할 수� 있습니다."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15168,11 +15292,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 msgid "Error trying to find the author identity to amend commit"
 msgstr "커밋� 수정한 작성� 신�� 찾는� 오류"
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15180,11 +15304,11 @@ msgstr ""
 "작업 ��� 커밋하지 않� 변경 사항� 있습니다. � 사항� 먼저\n"
 "커밋하고 'git rebase --continue' 명령� 다시 실행하십시오."
 
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "스테�징한 변경 사항� 커밋할 수 없습니다."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15198,39 +15322,39 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "편집기를 실행할 수 없습니다"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "$switch_to를 체�아웃할 수 없습니다"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "HEAD가 없습니다?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "대화형으로 표시할 수 없습니다."
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "다시 작성� 커밋� 초기화할 수 없습니다"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15240,7 +15364,7 @@ msgstr ""
 "하지만 모� 제거할 경우, 리베�스를 중지합니다.\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "단 빈 커밋� 주� 처리�었습니다."
 
@@ -15814,60 +15938,60 @@ msgstr "지역 시간대와 GMT� 차�가 분 단위가 아닙니다\n"
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "지역 시� 오프셋� 24시간보다 �거나 작습니다\n"
 
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "편집기가 비정��으로 �나서, 모� 중지합니다"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 안� 작성 중�었� 중간 버전� 전�메�� 들어 있습니다.\n"
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 안� 작성한 전�메�� 들어 있습니다.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 옵션� 다른 옵션과 호환�지 않습니다\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "저장소 밖�서 git format-patch 명령� 실행할 수 없습니다\n"
 
-#: git-send-email.perl:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "알 수 없는 --suppress-cc 필드: '%s'\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "알 수 없는 --confirm 설정: '%s'\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "경고: 따옴표가 있는 sendmail 별칭� 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "경고: `:include:`는 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "경고: `/file` �는 `|pipe` 리다�렉션� 지�하지 않습니다: %s\n"
 
-#: git-send-email.perl:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "경고: sendmail 줄� ���지 않습니다: %s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15882,12 +16006,12 @@ msgstr ""
 "    * 파�� ��했다면 \"./%s\"(�)�고 쓰고, 아니면\n"
 "    * 범위를 ��했다면 --format-patch 옵션 사용\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "%s� opendir 실패: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -15896,7 +16020,7 @@ msgstr ""
 "치명� 오류: %s: %s\n"
 "경고: 패치를 보내지 않았습니다\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -15906,17 +16030,17 @@ msgstr ""
 "패치 파�� 지정하지 않았습니다\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "%s 안� 제목 줄� 없습니다?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "%s� 쓰려고 여는� 실패: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15930,32 +16054,32 @@ msgstr ""
 "\n"
 "요약� 보내는 게 아니�면 본문 내용� 지우십시오.\n"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "%s.final� 여는� 실패: %s"
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "%s�(를) 여는� 실패: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 msgid "Summary email is empty, skipping it\n"
 msgstr "요약 전�메�� 비어 있어서 넘어갑니다.\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "정�로 <%s>�(를) 사용하시겠습니까 [y/N]? "
 
 # 주�: '8bit'��고 그대로 쓴다. 메� encoding 헤�� 쓸 literal� 가리킴
-#: git-send-email.perl:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -15963,11 +16087,11 @@ msgstr ""
 "다� 파�� 8bit�지만, Content-Transfer-Encoding� 설정하지 않았습니다.\n"
 
 # 주�: '8bit'��고 그대로 쓴다. 메� encoding 헤�� 쓸 literal� 가리킴
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "어떤 8bit �코딩� 선언합니까 [UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15980,20 +16104,20 @@ msgstr ""
 "제목 서�� '*** SUBJECT HERE ***'가 들어 있습니다. 정�로 보내려면 --force "
 "옵션� 사용하십시오.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "누구�게 전�메�� 보내야 합니까 (보낼 대�� 있다면)?"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "치명� 오류: '%s' 별칭� �기 �신� 가리킵니다\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "오류: 다��서 올바른 주소를 추출할 수 없습니다: %s\n"
@@ -16001,16 +16125,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "� 주소로 무엇� 하시겠습니까? ([q]�내기|[d]버리기|[e]편집): "
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "\"%s\" CA 경로가 없습니다"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16037,130 +16161,130 @@ 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:1335
+#: git-send-email.perl:1350
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "� 전�메�� 보내시겠습니까? ([y]예|[n]아니오|[q]�내기|[a]모�): "
 
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "필요한 전�메� 답장 보냅니다"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "필요한 SMTP 서버를 제대로 지정하지 않았습니다."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "서버�서 STARTTLS를 지�하지 않습니다! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 실패! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "SMTP를 제대로 초기화할 수 없습니다. 설정� 확�하고 --smtp-debug 옵션� 사용"
 "하십시오."
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "%s�(를) 보내는� 실패했습니다\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "%s 보내는 �내\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s 보냄\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "성공 �내. 기��:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "성공. 기��:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "ê²°ê³¼: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "결과: 정�\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "%s 파�� 열 수 없습니다"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) to: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox아님) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(본문) cc: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) '%s'� 실행할 수 없습니다"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) %s: %s 추가, '%s' 줄�서\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) '%s'(�)를 향한 파�프를 닫는� 실패했습니다"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "메시지를 7비트로 보낼 수 없습니다"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "잘못� 전송 �코딩"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "%s�(를) 열 수 없습니다: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: 패치� 998�보다 � 긴 줄� 들어 있습니다"
 
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "정�로 %s 파�� 보내시겠습니까? [y|N]: "
diff --git a/po/ru.po b/po/ru.po
index 75ec68c34..d4370b594 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-30 09:20+0000\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-22 17:34+0000\n"
 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr "ИÑ�правьте их в рабочем каталоге, затем Ð
 msgid "Exiting because of an unresolved conflict."
 msgstr "Выход из-за неразрешенного конфликта."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD)."
 
@@ -98,82 +98,82 @@ msgstr "неопознанна� опци� дл� пробелов «%s»"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "неопознанна� опци� дл� игнорировани� пробелов «%s»"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject и --3way нельз� и�пользовать одновременно."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached и --3way нельз� и�пользовать одновременно."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way вне репозитори�"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index вне репозитори�"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached вне репозитори�"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "�е удало�ь подготовить регул�рное выражение дл� метки времени %s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec возвратил %d дл� ввода: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "не удало�ь найти им� файла в �троке патча %d"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: плохой git-diff — ожидало�ь /dev/null, получено %s на �троке %d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� новое им� файла на �троке %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� �тарое им� файла на �троке %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: плохой git-diff  — ожидало�ь /dev/null на �троке %d"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "недопу�тимый режим %d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "противоречивые �троки заголовка %d и %d"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: не ожидаема� �трока: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "фрагмент изменений без заголовка на �троке %d: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname"
@@ -186,70 +186,70 @@ msgstr[1] "заголовок git diff не нашел информацию об
 msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "заголовок git diff не �одержит информации об имени файла (�трока %d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "новый файл зави�ит от �тарого �одержимого"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "удаленный файл в�е еще имеет �одержимое"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "патч поврежден на �троке %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новый файл %s зави�ит от �тарого �одержимого"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "удаленный файл %s в�е еще имеет �одержимое"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** предупреждение: файл %s �тановит�� пу�тым, но не удал�ет��"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "поврежденный двоичный патч на �троке %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неопознанный двоичный патч на �троке %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "патч � му�ором на �троке %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "не удало�ь прочитать �имвольную ��ылку %s"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "не удало�ь открыть или проче�ть %s"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправильное начало �троки: «%c»"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -258,257 +258,257 @@ msgstr[1] "Ча�ть #%d у�пешно применена на %d (�о �дв
 msgstr[2] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 msgstr[3] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Контек�т �ужен до (%ld/%ld), чтобы применить фрагмент на %d �троке"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr "при пои�ке:\n%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "пропущены данные двоичного патча дл� «%s»"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "невозможно выполнить reverse-apply дл� двоичного патча, без обращени� изменений блока «%s»"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "невозможно применить двоичный патч «%s» без �троки � указанной полной вер�ией индек�а"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "патч примен�т�� к файлу «%s» (%s), но его текущее �одержимое не �оотве�твует ожидаемому."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "патч примен�ет�� к пу�тому файлу «%s», но файл не пу�той"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "не удало�ь прочитать необходимую по�ылку %s дл� «%s»"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "не удало�ь применить двоичный патч к «%s»"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "по�ле применени� двоичного патча дл� «%s» был получен неправильный результат (ожидало�ь %s, получено %s)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ошибка применени� изменений: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "не удало�ь переключить �о�то�ние на %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "не удало�ь прочитать %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "чтение из «%s» за �имволиче�кой ��ылкой"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "путь %s был переименован/удален"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: нет в индек�е"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: не �овпадает � индек�ом"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "в репозитории от�ут�твует необходимый двоичный объект дл� отката к трёхходовому �ли�нию."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Откат к трёхходовому �ли�нию…\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "не удало�ь прочитать текущее �одержимое «%s»"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "�е удало�ь откатить�� к трёхходовому �ли�нию…\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Патч применен к «%s» � конфликтами.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Патч применен к «%s» без ошибок.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "патч удалени� не удалил �одержимое файла"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: неправильный тип"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s имеет тип %o, а ожидал�� %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправильный путь «%s»"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: уже �одержит�� в индек�е"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: уже �одержит�� в рабочем каталоге"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o) дл� %s"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "затронутый файл «%s» находит�� за �имволиче�кой ��ылкой"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: не удало�ь применить патч"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Проверка патча %s…"
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "информаци� об sha1 от�ут�твует или бе�полезна дл� подмодул� %s"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "изменен режим дл� %s, который не находит�� в текущем HEAD"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци� об sha1 от�ут�твует или бе�полезна (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "�бой make_cache_entry дл� пути «%s»"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "не удало�ь добавить %s во временный индек�"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "не удало�ь запи�ать временный индкек� в %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "не удало�ь удалить %s из индек�а"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "поврежденный патч дл� подмодул� %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "не удало�ь выполнить stat дл� �озданного файла «%s»"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "не удало�ь �оздать в�помогательный файл дл� �озданного файла %s"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не удало�ь �оздать запи�ь в к�ше дл� %s"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "не удало�ь запи�ать в «%s»"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "закрытие файла «%s»"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "не удало�ь запи�ать файл «%s» � режимом до�тупа %o"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Патч %s применен без ошибок."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "внутренн�� ошибка"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
@@ -517,45 +517,45 @@ msgstr[1] "Применение патча %%s � %d отказами…"
 msgstr[2] "Применение патча %%s � %d отказами…"
 msgstr[3] "Применение патча %%s � %d отказами…"
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "у�ечение имени .rej файла до %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "не удало�ь открыть %s"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Блок №%d применен без ошибок."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Блок №%d отклонен."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Патч «%s» пропущен."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "не ра�познанный ввод"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "не удало�ь прочитать файл индек�а"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "не удало�ь открыть патч «%s»: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -564,7 +564,7 @@ msgstr[1] "пропущено %d ошибки в пробельных �имво
 msgstr[2] "пропущено %d ошибок в пробельных �имволах"
 msgstr[3] "пропущено %d ошибок в пробельных �имволах"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -573,7 +573,7 @@ msgstr[1] "%d �троки добавили ошибки в пробельных
 msgstr[2] "%d �трок добавили ошибки в пробельных �имволах."
 msgstr[3] "%d �трок добавили ошибки в пробельных �имволах."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -582,134 +582,135 @@ msgstr[1] "%d �троки добавлено по�ле и�правлени�
 msgstr[2] "%d �трок добавлено по�ле и�правлени� ошибок в пробелах."
 msgstr[3] "%d �троки добавлено по�ле и�правлени� ошибок в пробелах."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "�е удало�ь запи�ать новый файл индек�а"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "путь"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "не примен�ть изменени� по указанному пути"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "примен�ть изменени� по указанному пути"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "количе�тво"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "удалить <количе�тво> ведущих ко�ых черт из традиционных путей �пи�ка изменений"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "игнорировать добавлени�, �деланные �тим патчем"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "вме�то применени� патча выве�ти �тати�тику добавлений и удалений дл� ввода"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "показать количе�тво добавленных и удаленных �трок в де��тичном пред�тавлении"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "вме�то применени� патча выве�ти �тати�тику изменений дл� ввода"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "вме�то применени� патча проверить подходит ли он"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверить, что патч примен�ет�� к текущему индек�у"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "применить патч, не измен�� рабочий каталог"
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr "прин�ть патч, который затрагивает файлы за рабочим каталогом"
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "а также применить патч (и�пользуйте � --stat/--summary/--check)"
 
-#: apply.c:4951
+#: apply.c:4977
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "попытать�� �делать трехходовое �ли�ние, е�ли патч не примен�ет��"
 
-#: apply.c:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr "по�троить временный индек�, о�нованный на в�троенной информации об индек�е"
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "пути, отделённые �УЛЕВЫМ �имволом"
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr "удо�товерить��, что по крайней мере <n> �трок контек�та �овпадают"
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:4960
+#: apply.c:4986
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "определ�ть новые или модифицированные �троки, у которых е�ть ошибки в пробельных �имволах"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "игнорировать изменени� в пробельных �имволах при пои�ке контек�та"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "применить патч � обращением изменений"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "не ожидать как минимум одной �троки контек�та"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тавить отклоненные блоки изменений в �оответ�твующих *.rej файлах"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "разрешить перекрывающие�� блоки изменений"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "быть много�ловнее"
 
-#: apply.c:4978
+#: apply.c:5004
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "разрешить некорректно определенные пропущенные пу�тые �троки в конце файла"
 
-#: apply.c:4981
+#: apply.c:5007
 msgid "do not trust the line counts in the hunk headers"
 msgstr "не довер�ть количе�тву �трок из заголовка блока изменений"
 
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "корень"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "добавить <корень> �переди ко в�ем именам файлов"
 
@@ -731,108 +732,108 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>]
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "�пецификатор пути «%s» не �оответ�твует ни одному файлу"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "формат"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "формат архива"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "префик�"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавл�ть префик� перед каждым путем файла в архиве"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "файл"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "запи�ь архива в �тот файл"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "читать .gitattributes в рабочем каталоге"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "отчет об архивированных файлах в stderr"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "только хранение"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "�жимать бы�трее"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "�жимать лучше"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "перечи�лить поддерживаемые форматы архивов"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "репозиторий"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получить архив из внешнего <репозитори�>"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "команда"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "путь к команде git-upload-archive на машине � внешним репозиторием"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "�еожиданна� опци� --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "Опци� --exec может и�пользовать�� только вме�те � --remote"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "�еожиданна� опци� --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "�еизве�тный формат архива «%s»"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�ргумент не поддерживает�� дл� формата «%s»: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s не �вл�ет�� допу�тимым именем атрибута"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -895,38 +896,38 @@ msgstr "База �ли�ни� между %s и [%s] должно быть пр
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Бинарный пои�к: база �ли�ни� должна быть проверена\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "нужно указать %s редакцию"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "не удало�ь �оздать файл «%s»"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "не удало�ь прочитать файл «%s»"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "�бой при чтении ��ылок двоичного пои�ка"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s была одновременно и %s и %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr "Те�тируемый коммит не найден.\nВозможно, вы начали пои�к � указанием неправильного параметра пути?\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -937,7 +938,7 @@ msgstr[3] "(примерно %d шагов)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -958,10 +959,10 @@ msgstr "нельзÑ� иÑ�пользовать --contents Ñ� указанием Ñ
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "при --reverse и --first-parent вме�те нужно указывать конкретный по�ледний коммит"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "�бой инициализации прохода по редакци�м"
 
@@ -996,43 +997,43 @@ msgstr "�е у�танавливаю ветку %s, так так она при
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Ветка %s от�леживает внешнюю ветку %s из %s перемещением."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "Ветка «%s» от�леживает внешнюю ветку «%s» из «%s» перемещением."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Ветка %s от�леживает внешнюю ветку %s из %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Ветка «%s» от�леживает внешнюю ветку «%s» из «%s»."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Ветка %s от�леживает локальную ветку %s перемещением."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "Ветка «%s» от�леживает локальную ветку «%s» перемещением."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Ветка %s от�леживает локальную ветку %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Ветка «%s» от�леживает локальную ветку «%s»."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Ветка %s от�леживает внешнюю ��ылку %s перемещением."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "Ветка «%s» от�леживает внешнюю ��ылку «%s» перемещением."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Ветка %s от�леживает внешнюю ��ылку %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Ветка «%s» от�леживает внешнюю ��ылку «%s»."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "Ветка %s от�леживает локальную ��ылку %s перемещением."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "Ветка «%s» от�леживает локальную ��ылку «%s» перемещением."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Ветка %s от�леживает локальную ��ылку %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Ветка «%s» от�леживает локальную ��ылку «%s»."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1053,22 +1054,22 @@ msgstr "«%s» не Ñ�влÑ�етÑ�Ñ� дейÑ�твительным именем Ð
 msgid "A branch named '%s' already exists."
 msgstr "Ветка � именем «%s» уже �уще�твует."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "�е удало�ь принудительно обновить текущую ветку."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid ""
 "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr "�е удало�ь на�троить информацию от�леживани�; �тартова� точка «%s» не �вл�ет�� веткой."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "запрошенна� ветка выше�то�щего репозитори� «%s» не �уще�твует"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1080,22 +1081,22 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr "\nЕ�ли вы планируете о�новывать �вою работу на выше�то�щей ветке, котора� уже �уще�твует во внешнем репозитории, вам может потребовать�� запу�тить «git fetch» дл� ее получени�.\n\nЕ�ли вы планируете отправить новую локальную ветку, котора� будет от�леживать��, во внешний репозиторий, вам может потребовать�� запу�тить «git push -u» — чтобы �охранить на�тройку выше�то�щего репозитори� дл� отправки."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "�едопу�тимое им� объекта: «%s»."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "�еоднозначное им� объекта: «%s»."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "�едопу�тима� точка ветки: «%s»."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» уже находит�� на «%s»"
@@ -1115,7 +1116,9 @@ msgstr "«%s» не похож на файл пакета вер�ии 2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "неопознанный заголовок: %s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "не удало�ь открыть «%s»"
@@ -1124,7 +1127,7 @@ msgstr "не удало�ь открыть «%s»"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В репозитории от�ут�твуют необходимые коммиты:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
@@ -1133,11 +1136,11 @@ msgstr[1] "Пакет �одержит �ти %d ��ылки:"
 msgstr[2] "Пакет �одержит �ти %d ��ылок:"
 msgstr[3] "Пакет �одержит �ти %d ��ылок:"
 
-#: bundle.c:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Пакет �одержит полную и�торию."
 
-#: bundle.c:195
+#: bundle.c:202
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
@@ -1146,38 +1149,38 @@ msgstr[1] "Пакет требует �ти %d ��ылки:"
 msgstr[2] "Пакет требует �ти %d ��ылок:"
 msgstr[3] "Пакет требует �ти %d ��ылок:"
 
-#: bundle.c:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "�е удало�ь �оздать объекты пакета"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "критиче�ка� ошибка pack-objects"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "критиче�ка� ошибка rev-list"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "��ылка «%s» и�ключена в �оответ�твии � опци�ми rev-list"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "неопознанный аргумент: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Отклонение �оздани� пу�того пакета."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "не удало�ь �оздать «%s»"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "критиче�ка� ошибка index-pack"
 
@@ -1186,8 +1189,8 @@ msgstr "критиче�ка� ошибка index-pack"
 msgid "invalid color value: %.*s"
 msgstr "недопу�тимое значение цвета: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "не удало�ь разобрать %s"
@@ -1197,7 +1200,7 @@ msgstr "не удало�ь разобрать %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s не �вл�ет�� коммитом!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1208,152 +1211,152 @@ msgstr "Предупреждение: Ñ�ообщение коммита не Ñ�Ð
 msgid "memory exhausted"
 msgstr "пам�ть и�черпана"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "отно�ительные у�ловные включени� конфигурации должны и�ходить из файлов"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ошибка в %d �троке двоичного объекта %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ошибка в %d �троке файла %s"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ошибка в %d �троке �тандартного ввода"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ошибка в %d �троке двоичного объекта подмодул� %s"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ошибка в %d �троке коммандной �троки %s"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ошибка в %d �троке в %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "вне диапазона"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "неправильное чи�ло"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s»: %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в двоичном объекте %s: %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в файле %s: %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» на �тандартном вводе: %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в двоичном объекте подмодул� %s: %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» на коммандной �троке %s: %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "�бой разворачивани� пути каталога пользовател�: «%s»"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправильный уровень �жати� zlib %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "недопу�тимый режим �оздани� объекта: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправильный уровень �жати� пакета %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "не удало�ь разобрать конфигурацию из командной �троки"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "произошла неизве�тна� ошибка при чтении файлов конфигурации"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�едей�твительный %s: «%s»"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "неизве�тное значение «%s» дл� core.untrackedCache; и�пользую �тандартное значение «keep»"
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "значение «%d» дл� splitIndex.maxPercentChange должно быть от 0 до 100"
 
-#: config.c:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "не удало�ь разобрать «%s» в конфигурации из командной �троки"
 
-#: config.c:2124
+#: config.c:2169
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправильна� переменна� конфигурации «%s» в файле «%s» на �троке %d"
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s имеет не�колько значений"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "�бой при выполнении fstat на файле %s"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "не удало�ь у�тановить «%s» в «%s»"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "не удало�ь �бро�ить значение дл� «%s»"
@@ -1370,19 +1373,19 @@ msgid ""
 "and the repository exists."
 msgstr "�е удало�ь прочитать из внешнего репозитори�.\n\nУдо�товерьте�ь, что у ва� е�ть необходимые права до�тупа\nи репозиторий �уще�твует."
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Проверка �оединени�"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "�е удало�ь запу�тить «git rev-list»"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "�бой запи�и в rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "�бой закрыти� �тандартного ввода у rev-list"
 
@@ -1391,7 +1394,7 @@ msgstr "�бой закрыти� �тандартного ввода у rev-lis
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
-msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь �вои оригинальные концы �трок в рашей рабочей копии."
+msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь �вои оригинальные концы �трок в вашей рабочей копии."
 
 #: convert.c:209
 #, c-format
@@ -1403,7 +1406,7 @@ msgstr "CRLF будет заменен на LF в %s."
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
-msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь �вои оригинальные концы �трок в рашей рабочей копии."
+msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь �вои оригинальные концы �трок в вашей рабочей копии."
 
 #: convert.c:219
 #, c-format
@@ -1505,273 +1508,283 @@ msgstr "�бой чтени� orderfile «%s»"
 msgid "Performing inexact rename detection"
 msgstr "Выполн�ет�� неточное определение переименовани�"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "параметр «%s» требует указани� значени�"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Сбой разбора величины �реза (cut-off) у dirstat «%s»\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "�еизве�тный параметр dirstat: «%s»\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra',"
+" 'plain'"
+msgstr "значение на�тройки цвета дл� перемещённых �трок должно быть одно из «no» «default», «zebra», «dimmed_zebra», «plain»"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�еизве�тное значени� дл� переменной «diff.submodule»: «%s»"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr "�айдены ошибки в переменной «diff.dirstat»:\n%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "критиче�ка� ошибка при внешнем �равнении, о�танов на %s"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check и -s нельз� и�пользовать одновременно"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow требует ровно одного �пецификатора пути"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Сбой разбора параметра опции --submodule: «%s»"
 
-#: diff.c:4716
+#: diff.c:5505
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "неточное определение переименовани� было пропущено из-за �лишком большого количе�тва файлов."
 
-#: diff.c:4719
+#: diff.c:5508
 msgid "only found copies from modified paths due to too many files."
 msgstr "найдены только копии из измененных путей из-за �лишком большого количе�тва файлов."
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "возможно вы захотите у�тановить переменную %s в как минимум значение %d и повторить вызов команды."
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "не удало�ь получить им� �дра и информацию"
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr "К�ш неот�леживаемых файлов отключен на �той �и�теме или в �том ме�те."
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "не удало�ь �оздать каталоги дл� %s"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "не удало�ь переме�тить каталог git � «%s» в «%s»"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Фильтрует�� �одержимое"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "не удало�ь выполнить stat дл� файла «%s»"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: ожидает�� передача �пи�ка дл� получение ча�ти"
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ожидает�� ACK/NAK, а получено EOF"
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "ошибка внешнего репозитори�: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ожидает�� ACK/NAK, а получено «%s»"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc требует multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправильна� �трока ча�тичного получени�: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправильна� �трока полного получени�: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "объект не найден: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "ошибка в объекте: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ча�тичный клон не найден: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "ожидало�ь shallow/unshallow, а получено %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "недопу�тимый коммит %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "о�танавливаю дальнейшие попытки"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "готово"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Помечаю %s как завершенный"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "уже е�ть %s (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не удало�ь запу�тить программу разбора данных"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "ошибка протокола: неправильный заголовок потока"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не удало�ь запу�тить программу %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s завершен � ошибкой"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "произошла  ошибка в  программе разбора данных"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Сервер не поддерживает клиентов � ча�тичным клонированием"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Сервер поддерживает multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Сервер поддерживает no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Сервер поддерживает multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Сервер поддерживает side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Сервер поддерживает side-band"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Сервер поддерживает allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Сервер поддерживает ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и� �ервера %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Сервер не поддерживает --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Сервер не поддерживает --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Сервер не поддерживает --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "не общих коммитов"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: ошибка при получении данных."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "нет �оотве�твующего внешнего указател� на ветку"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "нет такой внешней ��ылки %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сервер не поддерживает запро� необъ�вленного объекта %s"
@@ -1784,7 +1797,7 @@ msgstr "gpg не удало�ь подпи�ать данные"
 msgid "could not create temporary file"
 msgstr "не удало�ь �оздать временный файл"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "�бой запи�и от�оединенной подпи�и в «%s»"
@@ -1794,17 +1807,17 @@ msgstr "Ñ�бой запиÑ�и отÑ�оединенной подпиÑ�и в «%sÂ
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "игнорирую недопу�тимый цвет «%.*s» в log.graphColors"
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: не удало�ь проче�ть %s"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не удало�ь выполнить stat «%s»"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: �лишком мало данных прочитано"
@@ -1929,12 +1942,12 @@ msgstr "пу�тое им� идентификатора (дл� <%s>) не ра
 msgid "name consists only of disallowed characters: %s"
 msgstr "им� �о�тоит только из неразрешенных �имоволов: %s"
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправильный формат даты: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -1946,7 +1959,7 @@ msgid ""
 "remove the file manually to continue."
 msgstr "�е удало�ь �оздать «%s.lock»: %s.\n\nПохоже, что другой проце�� git запущен в �том репозитории,\nнапример редактор открыт из «git commit». Пожалуй�та, убедите�ь,\nчто в�е проце��ы были завершены и потом попробуйте �нова.\nЕ�ли �то не поможет, то возможно проце�� git был ранее завершен\n� ошибкой в �том репозитории: \nудалите файл вручную дл� продолжени�."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "�е удало�ь �оздать «%s.lock»: %s"
@@ -1955,237 +1968,237 @@ msgstr "�е удало�ь �оздать «%s.lock»: %s"
 msgid "failed to read the cache"
 msgstr "�бой чтени� к�ша"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "не удало�ь запи�ать новый файл индек�а"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(плохой коммит)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "�бой addinfo_cache дл� пути «%s»"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "ошибка при по�троении деревьев"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "не удало�ь �оздать путь «%s»%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Удаление %s, чтобы о�вободить ме�то дл� подкаталогов\n"
 
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": возможно, конфликт каталогов/файлов?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "отказ потери неот�леживаемого файла в «%s»"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "невозможно прочитать объект %s «%s»"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "ожидает�� двоичный объект дл� %s «%s»"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "не удало�ь открыть «%s»: %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "не удало�ь �оздать �имвольную ��ылку «%s»: %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "не пон�тно, что делать � %06o %s «%s»"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "�е удало�ь запу�тить внутреннее �ли�ние"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�е удало�ь добавить %s в базу данных"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Вер�и� %s из %s о�тавлена в дереве."
 
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Вер�и� %s из %s о�тавлена в дереве."
 
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Вер�и� %s из %s о�тавлена в дереве на %s."
 
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
 #, 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 "КО�ФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Вер�и� %s из %s о�тавлена в дереве на %s."
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "переименование"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "переименовано"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s — �то каталог в %s, добавл�ем как %s вме�то �того"
 
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
 "\"%s\"->\"%s\" in \"%s\"%s"
 msgstr "КО�ФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (о�тавлено неразрешенным)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Переименовываю %s в %s и %s в %s вме�то �того"
 
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "КО�ФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
 
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Добавление �литого %s"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добавление вме�то �того как %s"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "невозможно прочитать объект «%s»"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "объект %s не �вл�ет�� двоичным объектом"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "изменение"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "изменено"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "�одержимое"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "добавление/добавление"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пропу�к %s (�литы одинаковые изменени� как �уще�твующие)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�вто�ли�ние %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "подмодуль"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт �ли�ни� в %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "Удаление %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "файл/каталог"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "каталог/файл"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Добавление %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Уже обновлено!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "�бой �ли�ни� деревьев «%s» и «%s»"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Сли�ние:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
@@ -2194,27 +2207,27 @@ msgstr[1] "найдено %u общих предка:"
 msgstr[2] "найдено %u общих предков:"
 msgstr[3] "найдено %u общих предков:"
 
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "�ли�ние не вернуло коммит"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�е удало�ь разобрать объект «%s»"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "�е удает�� запи�ать индек�."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, 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."
 msgstr "Вы не закончили предыдущее �ли�ние заметок (%s �уще�твует).\nЗапу�тите «git notes merge --commit» или «git notes merge --abort» дл� коммита или отмены предыдущего �ли�ни� и запу�ка нового �ли�ни� заметок."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Вы не закончили предыдущее �ли�ние заметок (%s �уще�твует)."
@@ -2241,33 +2254,47 @@ msgstr "Отказ в перезапи�и заметок в %s (за преде
 msgid "Bad %s value: '%s'"
 msgstr "�еправильное значение переменной %s: «%s»"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "не удало�ь разобрать объект: %s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "�двиг до конца файла пакета (возможно, повреждён файл .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "�двиг до начала индек�а пакета дл� %s (повреждён индек�?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "�двиг за пределами индек�а пакета дл� %s (обрезан индек�?)"
+
 #: parse-options.c:573
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "и�пользование: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "          или: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "            %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-КОЛИЧЕСТВО"
 
@@ -2276,7 +2303,7 @@ msgstr "-КОЛИЧЕСТВО"
 msgid "malformed object name '%s'"
 msgstr "�еправильное им� объекта «%s»"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е удало�ь предо�тавить до�туп к %s на запи�ь"
@@ -2347,18 +2374,18 @@ msgstr "«%s» (мнемоника: «%c»)"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�кие �лова в �пецификаторе пути не поддерживают�� командой: %s"
 
-#: pathspec.c:575
+#: 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 "пу�тые �троки как �пецификаторы пути будут �деланы недопу�тимыми в �ледующих вер�и�х. и�пользуйте вме�то них «.», что значит �оотве�твие в�ем пут�м"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "�пецификатор пути «%s» находит�� за �имволиче�кой ��ылкой"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "не удало�ь разобрать формат дл� --pretty"
 
@@ -2376,50 +2403,51 @@ msgid ""
 "Using version %i"
 msgstr "GIT_INDEX_VERSION указан, но значение недей�твительное.\nИ�пользую вер�ию %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "не удало�ь закрыть «%s»"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "не удало�ь выполнить stat дл� «%s»"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не удало�ь открыть каталог git: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "не удало�ь от�оединить: %s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "�е удало�ь открыть «%s» дл� запи�и"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "обновление ��ылок запрещено в изолированном окружении"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "не удало�ь удалить ��ылки %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "не удало�ь удалить ��ылку %s: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "не удало�ь удалить ��ылки: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "не удало�ь удалить ��ылки %s"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "и�чез"
@@ -2449,262 +2477,262 @@ msgstr "ожидаемый формат: %%(color:<color>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "неопознанный цвет: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Ожидает�� целочи�ленное значение refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Ожидает�� целочи�ленное значение refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "неопознанный аргумент %%(%s): %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "параметр %%(body) не принимает аргументы"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "параметр %%(subject) не принимает аргументы"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "параметр %%(trailers) не принимает аргументы"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "неизве�тный аргумент дл� %%(trailers): %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "положительное значение ожидает contents:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "неопознанный аргумент %%(contents): %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "ожидает�� положительное значение objectname:short=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "неопознанный аргумент %%(objectname): %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "ожидаемый формат: %%(align:<width>,<position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "неопознанна� позици�:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "неопознанна� ширина:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "неопознанный аргумент %%(align): %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "ожидает�� положительна� ширина � указанием ча�тицы %%(align)"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "неопознанный аргумент %%(if): %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправильное им� пол�: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "неизве�тное им� пол�: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "формат: ча�тица %%(if) и�пользована без ча�тицы %%(then)"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "формат: ча�тица %%(then) и�пользована без ча�тицы %%(if)"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: ча�тица %%(then) и�пользована более одного раза"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: ча�тица %%(then) и�пользована по�ле %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "формат: ча�тица %%(else) и�пользована без ча�тицы %%(if)"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "формат: ча�тица %%(else) и�пользована без ча�тицы %%(then)"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: ча�тица %%(else) и�пользована более одного раза"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: ча�тица %%(end) и�пользована без �оответ�твующей ча�тицы"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "неправильна� �трока формата %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(нет ветки, перемещение %s)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(нет ветки, двоичный пои�к начат на %s)"
 
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD отделён на %s)"
 
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD отделён начина� � %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(нет ветки)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "не найден объект %s дл� %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "�бой при выполнении parse_object_buffer на %s дл� %s"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "Повреждённый объект «%s»"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнорирую ��ылку � неправильным именем %s"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнорирую неправильную ��ылку %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: пропущена ча�тица %%(end)"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправильное им� объекта %s"
 
-#: remote.c:747
+#: remote.c:750
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�ельз� извлечь одновременно %s и %s в %s"
 
-#: remote.c:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s обычно от�леживает %s, а не %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s от�леживает и %s и %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD не указывает на ветку"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "нет такой ветки: «%s»"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "выше�то�ща� ветка не на�троена дл� ветки «%s»"
 
-#: remote.c:1698
+#: remote.c:1699
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "выше�то�ща� ветка «%s» не �охранена как от�леживаема� ветка"
 
-#: remote.c:1713
+#: remote.c:1714
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "назначение дл� отправки «%s» на внешнем �ервере «%s» не имеет локальной от�леживаемой ветки"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ветка «%s» не имеет внешнего �ервера дл� отправки"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "�пецификаторы пути дл� отправки «%s» не включают в �еб� «%s»"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "отправка не имеет точки назначени� (push.default вы�тавлен в «nothing»)"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "не удало�ь выполнить «simple» отправку в един�твенную точку назначени�"
 
@@ -2719,7 +2747,7 @@ msgstr "(дл� и�правлени� запу�тите «git branch --unset-u
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ваша ветка обновлена в �оответ�твии � «%s».\n"
 
 #: remote.c:2087
@@ -2766,16 +2794,16 @@ msgstr[3] "Ваша ветка и «%s» разделили�ь\nи теперь
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (и�пользуйте «git pull», чтобы �лить внешнюю ветку в вашу)\n"
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "похоже, ваша текуща� ветка повреждена"
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ваша текуща� ветка «%s» еще не �одержит ни одного коммита"
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опцию --first-parent нельз� и�пользовать одновременно � --bisect"
 
@@ -2815,92 +2843,93 @@ msgstr "принимающа� �торона не поддерживает от
 msgid "the receiving end does not support push options"
 msgstr "принимающа� �торона не поддерживает отправку � опци�ми"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "обратить изменени�"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "копировать коммит"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "�еизве�тное дей�твие: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr "по�ле разрешени� конфликтов, пометьте и�правленные пути\n� помощью «git add <пути>» или «git rm <пути>»"
 
-#: sequencer.c:282
+#: sequencer.c:284
 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 "по�ле разрешени� конфликтов, пометьте и�правленные пути\n� помощью «git add <пути>» или «git rm <пути>»\nи �делайте коммит � помощью «git commit»"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "не удало�ь заблокировать «%s»"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "не удало�ь запи�ать в «%s»"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "не удало�ь запи�ать eol в «%s»"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "не удало�ь завершить «%s»."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "не удало�ь прочитать «%s»"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "ваши локальные изменени� будут перезапи�аны %s."
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr "дл� продолжени� закоммитьте ваши изменени� или �пр�чьте их."
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: перемотка вперед"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: �е удало�ь запи�ать файл индек�а"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "не удало�ь ра�познать HEAD коммит\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "не удало�ь обновить дерево к�ша\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2917,17 +2946,17 @@ msgid ""
 "  git rebase --continue\n"
 msgstr "у ва� имеют�� проиндек�ированные изменени� в рабочем каталоге. Е�ли �ти изменени� должны быть объеденены � предыдущим коммитом, то запу�тите:\n\n  git commit --amend %s\n\nЕ�ли же они должны быть помещены в новый коммит, то запу�тите:\n\n  git commit %s\n\nВ любом �лучае, по�ле того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "не удало�ь разобрать коммит %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "не удало�ь разобрать родитель�кий коммит %s\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -2935,7 +2964,7 @@ msgid ""
 "\t%.*s"
 msgstr "неожиданна� перва� �трока �ообщени� уплотнени�:\n\n\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -2943,229 +2972,230 @@ msgid ""
 "\t%.*s"
 msgstr "недопу�тима� перва� �трока �ообщени� уплотнени�:\n\n\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Это объединение %d коммитов."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "нужен HEAD дл� и�правлени�"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "не удало�ь прочитать HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "не удало�ь прочитать �ообщение коммита текущего HEAD"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "не удало�ь запи�ать «%s»"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Это 1-е �ообщение коммита:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "не удало�ь прочитать �ообщение коммита дл� %s"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Это �ообщение коммита номер #%d:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Сообщение коммита номер #%d будет пропущено:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "неизве�тна� команда: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "ваш индек� не �лит."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "коммит %s — �то коммит-�ли�ние, но опци� -m не указана."
 
-#: sequencer.c:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "у коммита %s нет предка %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "о�новна� ветка указана, но коммит %s не �вл�ет�� �ли�нием."
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: не удало�ь разобрать родитель�кий коммит дл� %s"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "не удало�ь переименовать «%s» в «%s»"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "не удало�ь обратить изменени� коммита %s… %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "не удало�ь применить коммит %s… %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "передан пу�той набор коммитов"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: �бой чтени� индек�а"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: �бой обновлени� индек�а"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправильна� �трока %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "нельз� выполнить «%s» без указани� предыдущего коммита"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "не удало�ь прочитать «%s»."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "пожалуй�та и�правьте �то � помощью «git rebase --edit-todo»."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "непригодна� дл� и�пользовани� карта � ин�трукци�ми: «%s»"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "коммиты не разобраны."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "нельз� �копировать коммит во врем� проце��а обращени� коммита."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "нельз� обратить изменени� коммита во врем� копировани� коммита."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "недей�твительный ключ: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправильное значение %s: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "и�порченна� карта � опци�ми: «%s»"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "копирование или обращение изменений коммита уже выполн�ют��"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "не удало�ь �оздать каталог дл� указател� �ледовани� коммитов «%s»"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "не удало�ь заблокировать HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "копирование или обращение изменений коммита уже выполн�ют��"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "не удало�ь определить HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr "нельз� отменить изменени� � ветки, котора� еще не �оздана"
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "не удало�ь открыть «%s»"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "не удало�ь прочитать «%s»: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "неожиданный конец файла"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�охраненный файл � HEAD перед копированием коммита «%s» поврежден"
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Похоже, что вы переме�тили HEAD. Перемотка не выполн�ет��, проверьте �вой указатель HEAD!"
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "не удало�ь прочитать HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "не удало�ь �копировать «%s» в «%s»"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "не удало�ь прочитать индек�"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3175,11 +3205,11 @@ msgid ""
 "\n"
 msgstr "ошибка выполнени�: %s\n%sВы можете и�править ошибку, а затем запу�тить\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и были �деланы изменени� в индек�е и/или в рабочем каталоге\n"
 
-#: sequencer.c:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3190,17 +3220,17 @@ msgid ""
 "\n"
 msgstr "у�пешное выполнение: %s\nно о�тали�ь изменени� в индек�е и/или в рабочем каталоге\nСделайте коммит или �пр�чьте ваши изменени�, а затем выполните\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Применены автоматиче�ки �пр�танные изменени�.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "не удало�ь �охранить %s"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3208,81 +3238,154 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr "Применение автоматиче�ки �пр�танных изменений вызвало конфликты.\nВаши изменени� �пр�таны и в безопа�но�ти.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "О�тановлено на %s …  %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "неизве�тна� команда %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "не удало�ь прочитать orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "не удало�ь прочитать «onto»"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "не удало�ь обновить %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "не удало�ь обновить HEAD на %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не удало�ь выполнить перемещение коммитов: У ва� е�ть непроиндек�ированные изменени�."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "не удало�ь удалить CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "не удало�ь и�править не�уще�твующий коммит"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "недопу�тимый файл: «%s»"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "недопу�тимое �одержимое: «%s»"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr "\nУ ва� имеют�� незакоммиченные изменени� в рабочем каталоге. Сделайте коммит, а затем запу�тите «git rebase --continue» �нова."
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "не удало�ь закоммитить проиндек�ированные изменени�."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не удало�ь �копировать коммит %s"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: плоха� редакци�"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "нельз� возвратить изначальный коммит"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: не обработанные опции"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: ошибка при обновлении редакций"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "непригодный дл� и�пользовани� �пи�ок дел: «%s»"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "не удало�ь открыть «%s» дл� запи�и"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "нера�познанна� на�тройка %s дл� опции rebase.missingCommitsCheck. Игнорирую."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к �тарым):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr "Дл� избежани� �того �ообщени�, и�пользуйте «drop» чтобы �вно удалить коммит.\n\nИ�пользуйте опцию «git config rebase.missingCommitsCheck» дл� изменени� количе�тва предупреждений.\nВозможные значени�: ignore, warn, error.\n\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 "Вы можете и�править �то � помощью «git rebase --edit-todo», а потом запу�тив «git rebase --continue».\nИли вы можете прервать проце�� перемещени�, выполнив «git rebase --abort»\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "не удало�ь разобрать коммит «%s»"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "не удало�ь открыть «%s» дл� запи�и"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "не удало�ь обрезать «%s»"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "�ценарий уже был пере�троен."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "не удало�ь закончить «%s»"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3306,96 +3409,82 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr "неоднозначный аргумент «%s»: �вл�ет�� одновременно и редакцией и именем файла.\nИ�пользуйте «--» дл� отделени� путей от редакций, вот так:\n«git <команда> [<редакци�>…] -- [<файл>…]»"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Ожидаема� вер�и� git репозитори� <= %d, а обнаружена %d"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "обнаружены неизве�тные ра�ширени� репозитори�:"
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "�е найден git репозитоий (или один из его каталогов): %s"
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "�е удало�ь вернуть�� в текущий рабочий каталог"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "�е удало�ь прочитать текущий рабочий каталог"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "�е удало�ь изменить на «%s»"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "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_DISCOVERY_ACROSS_FILESYSTEM не у�тановлен)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "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:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "путь «%s» не �уще�твует"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "��ылаемый репозиторий «%s» как �в�занное �о�то�ние, пока не поддерживает��."
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "��ылаемый репозиторий «%s» не �вл�ет�� локальным."
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� ча�тичным"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� �ращенным"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "�двиг до конца файла пакета (возможно, повреждён файл .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "�двиг до начала индек�а пакета дл� %s (повреждён индек�?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "�двиг за пределами индек�а пакета дл� %s (обрезан индек�?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "�окращённый SHA1 идентификатор %s неоднозначен"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Возможно, вы имели в виду:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3408,81 +3497,86 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr "Обычно Git не �оздает ��ылки, оканчивающие�� на 40 ше�тнадцатеричных\n�имволов, потому, что они будут игнорировать��, когда вы про�то\nукажете �то 40-�имвольное ше�тнадцатеричное чи�ло. Такие ��ылки\nмогли быть �озданы по ошибке. �апример, � помощью:\n\n  git checkout -b $br $(git rev-parse …)\n\n, е�ли «$br» оказал�� пу�тым, то ��ылка � 40-�имвольным\nше�тнадцатеричным чи�лом будет �оздана. Пожалуй�та, про�мотрите �ти\n��ылки и, возможно, удалите их. Вы можете отключить �то �ообщение\nзапу�тив «git config advice.objectNameWarning false»"
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "�е удало�ь изменить не �литый .gitmodules, �начала разрешите конфликты"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "�е удало�ь найти раздел в .gitmodules, где путь равен %s"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr " �е удало�ь обновить .gitmodules запи�ь %s"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "�е удало�ь удалить запи�ь в .gitmodules дл� %s"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "�бой индек�ировани� обновленного .gitmodules"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "нельз� и�пользовать отприцательные значени� дл� submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "в пу�том подмодуле «%s»"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "запи�ь подмодул� «%s» (%s) �вл�ет�� %s, а не �вл�ет�� коммитом"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "�е удало�ь определить HEAD как дей�твительную ��ылку."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "«%s» не ра�познан как репозиторий git"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "не удало�ь запу�тить «git status» в подмодуле «%s»"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "не удало�ь запу�тить «git status» в подмодуле «%s»"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "подмодуль «%s» имеет изменённый индек�"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "relocate_gitdir дл� подмодул� «%s» � указанием более одного рабочего дерева не поддерживает��"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "не удало�ь запро�ить им� подмодул� «%s»"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3490,101 +3584,105 @@ msgid ""
 "'%s'\n"
 msgstr "Перемещение каталога git дл� «%s%s» из\n«%s» в\n«%s»\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "не удало�ь рекур�ивно зайти в подмодуль «%s»"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "не удало�ь выполнить stat ls-files в .."
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ОШИБК�: возвращенна� �трока не �оответ�вует cwd?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree вернул неожиданный код %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "нельз� и�пользовать отрицательные значени� дл� submodule.fetchjobs"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "неправильное значение %s"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "�бой при запу�ке команды завершител� «%s»"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "неизве�тное значение «%s» дл� ключа «%s»"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "больше одного %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "пу�та� по�ледн�� лек�ема в завершителе «%.*s»"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "не удало�ь прочитать входной файл «%s»"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "не удало�ь прочитать из �тандартного ввода"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "не удало�ь выполнить stat дл� %s"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "файл %s не �вл�ет�� обычным файлом"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "файл %s не до�тупен на запи�ь пользователю"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "не удало�ь �оздать временный файл"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "не удало�ь переименовать временный файл в %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Будет у�тановлен выше�то�щий репозиторий дл� «%s» на «%s» � «%s»\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "тран�порт: неправильный параметр глубины «%s»"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "Подмодули по указанным пут�м �одержат изменени�, которые не найдены ни на одном из внешних репозиториев:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3600,7 +3698,7 @@ msgid ""
 "\n"
 msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог � помощью команды cd и выполнить\n\n\tgit push\n\nдл� их отправки на внешний репозиторий.\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Прерываю."
 
@@ -3621,187 +3719,182 @@ msgstr "неправильный режим в запи�и дерева"
 msgid "empty filename in tree entry"
 msgstr "пу�тое им� файла в запи�и дерева"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "�лишком  короткий файл дерева"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, 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 "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед переключением веток."
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, 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 "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\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"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\n%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, 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 "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед %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"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr "Обновление указанных каталогов приведет к потере неот�леживаемых файлов в них:\n%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, 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 "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\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"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 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"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при �ли�нии:\n%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 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"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при �ли�нии:\n%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ь «%s» ча�тично �овпадает � «%s».  �е удало�ь назначить �оответ�твие."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr "�е удало�ь обновить ча�тичное �о�то�ние: �ледующие �лементы не по�ледней вер�ии:\n%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout update:\n"
 "%s"
 msgstr "Указанные файлы из рабочего каталога будут перезапи�аны при обновлении ча�тичного �о�то�ни�:\n%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout update:\n"
 "%s"
 msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении ча�тичного �о�то�ни�:\n%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr "�е удоло�ь обновить подмодуль:\n%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Прерываю\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "�тратеги� обновлени� подмодул� не поддерживает�� подмодулем «%s»"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "Ра�паковка файлов"
 
@@ -3844,13 +3937,8 @@ msgstr "не удало�ь прочитать «%s»"
 msgid "could not open '%s' for reading and writing"
 msgstr "не удало�ь открыть «%s» дл� чтени� и запи�и"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удало�ь открыть «%s» дл� запи�и"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "не удало�ь открыть «%s» дл� чтени�"
@@ -3874,135 +3962,135 @@ msgstr "не удало�ь запи�ать в %s"
 msgid "could not close %s"
 msgstr "не удало�ь закрыть %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "�е �литые пути:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (и�пользуйте «git reset %s <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (и�пользуйте «git rm --cached <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
 
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Изменени�, которые будут включены в коммит:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Изменени�, которые не в индек�е дл� коммита:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы добавить файл в индек�)"
 
-#: wt-status.c:224
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индек�а)"
 
-#: wt-status.c:225
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working "
 "directory)"
 msgstr "  (и�пользуйте «git checkout -- <файл>…», чтобы отменить изменени�\n   в рабочем каталоге)"
 
-#: wt-status.c:227
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  (�делайте коммит или отмените изменени� в неот�леживаемом или измененном �одержимом в подмодул�х)"
 
-#: wt-status.c:239
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (и�пользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "оба удалены:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "добавлено нами:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "удалено ими:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "добавлено ими:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "удалено нами:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "оба добавлены:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "оба изменены:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "новый файл:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "�копировано:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "удалено:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "изменено:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "переименовано:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "изменен тип:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "неизве�тно:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "не �литые:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "новые коммиты, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "изменено �одержимое, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "неот�леживаемое �одержимое, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
@@ -4011,57 +4099,57 @@ msgstr[1] "У ва� �ейча� �пр�таны %d запи�и"
 msgstr[2] "У ва� �ейча� �пр�тано %d запи�ей"
 msgstr[3] "У ва� �ейча� �пр�таны %d запи�и"
 
-#: wt-status.c:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Измененные, но не обновленные подмодули:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Изменени� в подмодул�х, которые будут закоммичены:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr "�е трогайте �троку выше �той.\nВ�ё, что ниже — будет удалено."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr "�е измен�йте или удал�йте �троку выше �той.\nВ�ё, что ниже — будет проигнорировано."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "У ва� е�ть не �литые пути."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git commit»)"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (и�пользуйте «git merge --abort», чтобы о�тановить операцию �ли�ни�)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�е конфликты и�правлены, но вы в�е еще в проце��е �ли�ни�."
 
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (и�пользуйте «git commit», чтобы завершить �ли�ние)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "Вы в проце��е �е��ии am."
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Текущий патч пу�той."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git am --continue»)"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (и�пользуйте «git am --skip», чтобы пропу�тить �тот патч)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (и�пользуйте «git am --abort», чтобы во��тановить оригинальную ветку)"
 
@@ -4341,7 +4429,7 @@ msgstr "к тому же, в вашем индек�е е�ть незакомм
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не удало�ь выполнить %s: В вашем индек�е е�ть незакоммиченные изменени�."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "�бой от�оединени� «%s»"
@@ -4355,7 +4443,7 @@ msgstr "git add [<опции>] [--] <�пецификатор-пути>…"
 msgid "unexpected diff status %c"
 msgstr "неожиданный �тату� различий %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "�бой при обновлении файлов"
 
@@ -4364,108 +4452,108 @@ msgstr "�бой при обновлении файлов"
 msgid "remove '%s'\n"
 msgstr "удалить «%s»\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "�епроиндек�ированные изменени� по�ле обновлени� индек�а:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "�е удало�ь прочитать индек�"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "�е удало�ь открыть «%s» дл� запи�и."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "�е удало�ь запи�ать патч"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "�бой при редактировании патча"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е удало�ь выполнить stat дл� «%s»"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Пу�той патч. Операци� прервана."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�е удало�ь применить «%s»"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Следующие пути игнорируют�� одним из ваших файлов .gitignore:\n"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "пробный запу�к"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "интерактивный выбор"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "интерактивный выбор блоков"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "отредактировать текущий файл различий и применить его"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "разрешить добавление игнорируемых иначе файлов"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "обновить от�леживаемые файлы"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "запи�ать только факт, что путь будет добавлен позже"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "добавить изменени� из в�ех от�леживаемых и неот�леживаемых файлов"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "не добавл�ть, только обновить индек�"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr "пропу�кать файлы, которые не могут быть добавлены из-за ошибок"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "удо�товерить��, что даже недо�тающие файлы будут проигнорированы при  пробном запу�ке"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "переопределить бит выполнени� на указанных файлах"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "предупреждать при добавлении в�троенного git репозитори�"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4483,399 +4571,399 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr "Вы добавили другой репозиторий git внутри текущего репозитори�\nКлоны внешнего репозитори� не будут �одержать внутренний\nрепозиторий и не будут знать как его получить.\nЕ�ли вы хотели добавить подмодуль, то запу�тите:\n\n\tgit submodule add <url> %s\n\nЕ�ли бы добавили �тот путь по ошибке, то вы можете удалить его\nиз индек�а � помощью:\n\n\tgit rm --cached %s\n\nДл� дополнительной информации �мотрите «git help submodule»."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добавление в�троенного git репозитори�: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "И�пользуйте -f, е�ли вы дей�твительно хотите добавить их.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "ошибка при добавлении файлов"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A и -u нельз� и�пользовать одновременно"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Опци� --ignore-missing может и�пользовать�� только вме�те � --dry-run"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметр --chmod «%s» должен быть -x или +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ичего не указано, ничего не добавлено.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Возможно, вы имели в виду «git add .»?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "файл индек�а поврежден"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "не удало�ь разобрать �ценарий автор�тва"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "«%s» был удален перехватчиком applypatch-msg"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�еправильна� �трока ввода: «%s»."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "�е удало�ь �копировать заметку из «%s» в «%s»"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "�бой при выполнении fseek"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "не удало�ь разобрать патч «%s»"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Только �ери� патчей StGIT может быть применена за раз"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "недопу�тима� метка даты/времени"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "недопу�тима� �трока даты"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "недопу�тимое �мещение ча�ового по��а"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Сбой определени� формата патча."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "�е удало�ь разделить патчи на ча�ти."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "не удало�ь запи�ать индек�"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Когда вы у�траните �ту проблему, запу�тите «%s --continue»."
 
-#: builtin/am.c:1172
+#: builtin/am.c:1194
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Е�ли вы хотите пропу�тить �тот патч, то запу�тите «%s --skip»."
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "Чтобы вернуть�� на предыдущую ветку и о�тановить применение изменений, запу�тите «%s --abort»."
 
-#: builtin/am.c:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Патч пу�той."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "неправильна� �трока идентификации: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "не удало�ь разобрать коммит %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "В репозитории от�ут�твуют двоичные объекты, необходимые дл� отката к трехходовому �ли�нию."
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr "И�пользую индек� дл� рекон�трукции базового дерева…"
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr "Вы вручную измен�ли патч?\nОн не накладывает�� без ошибок на двоичные объекты, запи�анные в его заголовке."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Откат к применению изменений к базовому коммиту � помощью трехходового �ли�ни�…"
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "�е удало�ь �лить изменени�."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree не удало�ь запи�ать дерево"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "применение к пу�той и�тории"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "�бой запи�и объекта коммита"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "нельз� продолжнить: %s не �уще�твует "
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "не удало�ь и�пользовать интерактивное поведение, без stdin подключенного к терминалу."
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Тело коммита:"
 
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - про�мотреть патч/[a] - применить в�ё: "
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Индек� не пу�той: нельз� примен�ть патчи (в индек�е: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Применение: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "�ет изменений — Патч уже применен."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Ошибка применени� изменений на %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Копию изменений, которые не удало�ь применить, вы можете найти в: %s"
 
-#: builtin/am.c:1915
+#: builtin/am.c:1913
 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 "�ет изменений — возможно, вы забыли вызвать «git add»?\nЕ�ли ничего не о�тало�ь дл� индек�ации, то, �корее в�его, что-то другое уже �делало те же изменени�; возможно, вам �ледует пропу�тить �тот патч."
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 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 might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr "У ва� е�ть не �литые пути в индек�е.\nВы должны выполнить «git add» дл� каждого файла � разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запу�тить «git rm» � именем файла, чтобы пометить его как «удалено ими»."
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�е удало�ь разобрать объект «%s»."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "не удало�ь очи�тить индек�"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "Похоже, что вы переме�тили HEAD � момента по�ледней ошибки выполнени� «am».\nПеремотка на ORIG_HEAD не выполн�ет��"
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправильное значение дл� --patch-format: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<опции>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "запу�тить в интерактивном режиме"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "и�ториче�ка� опци� — ничего не делает"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "разрешить откатить�� к трехходовому �ли�нию, е�ли нужно"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "тихий режим"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добавить �троку Signed-off-by к �ообщению коммита"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "перекодировать в utf8 (по умолчанию)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "передать флаг -k в git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "передать флаг -b в git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "передать флаг -m в git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "передать флаг --keep-cr в git-mailsplit дл� формата mbox"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "не передавать --keep-cr флаг в git-mailsplit вне зави�имо�ти от am.keepcr"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "обрезать в�е до �троки обрезки"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "передать его в git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: 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:399 parse-options.h:132 parse-options.h:134
+#: builtin/tag.c:377 parse-options.h:132 parse-options.h:134
 #: parse-options.h:245
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "формат"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "формат, в котором наход�т�� патчи"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "переопределить �ообщение об ошибке, е�ли не удало�ь наложить изменени�"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "продолжить применение изменений по�ле разрешени� конфиликта"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "�иноним дл� --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "пропу�тить текущий патч"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr "во��тановить оригинальную ветку и отменить операцию применени� изменений."
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "�оврать о дате коммитера"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "и�пользовать текущее врем� как врем� автор�тва"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "подпи�ать коммиты � помощью GPG"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(внутреннее и�пользование дл� git-rebase)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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 "Опци� -b/--binary уже долгое врем� ничего не делает и будет удалена � �ледующих вер�и�х Git. Пожалуй�та, не и�пользуйте ее."
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "�бой чтени� индек�а"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "предыдущий каталог перемещени� %s еще �уще�твует, но передан mbox."
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr "�айден забытый каталог %s.\nИ�пользуйте «git am --abort», чтобы удалить его."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Операци� разрешени� конфликтов не в проце��е выполнени�, не продолжаем."
 
@@ -5078,124 +5166,149 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<опции>] (-m | -M) [<�тара�-ветка>] <нова�-ветка>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<опции>] (-c | -C) [<�тара�-ветка>] <нова�-ветка>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<опции>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<опции>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr "удаление ветки «%s», котора� была �лита �\n         «%s», но не �лита � HEAD."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr "не удаление ветки «%s», котора� еще не �лита �\n         «%s», хот� уже �лита � HEAD."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "�е удало�ь найти объект коммита дл� «%s»"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr "Ветка «%s» не �лита полно�тью.\nЕ�ли вы уверены, что хотите ее удалить, запу�тите «git branch -D %s»."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "�е удало�ь обновить файл конфигурации"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "нельз� и�пользовать одновременно ключи -a и -d"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "�е удало�ь найти объект коммита дл� HEAD"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "�ельз� удалить ветку «%s» т.к. она активна на «%s»"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "внешн�� от�леживаема� ветка «%s» не найдена."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ветка «%s» не найдена."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Ошибка удалени� внешней от�леживаемой ветки «%s»"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Ошибка удалени� ветки «%s»"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Внешн�� от�леживаема� ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "не удало�ь разобрать �троку формата"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Производит�� перемещение ветки %s на %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Производит�� двоичный пои�к в ветке %s на %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "невозможно �копировать текущую ветку, е�ли вы не находите�ь ни на одной из веток."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr "невозможно переименовать текущую ветку, е�ли вы не находите�ь ни на одной из них."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�едей�твительное им� ветки: «%s»"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "Сбой переименовани� ветки"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Сбой копировани� ветки"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Скопирована неправильно названна� ветка «%s»"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Переименована неправильно названна� ветка «%s»"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Ветка переименована в %s, но HEAD не обновлен!"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Ветка переименована, но произошел �бой обновлени� файла конфигурации"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Ветка �копирована, но произошел �бой обновлени� файла конфигурации"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5203,226 +5316,225 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr "Измените опи�ание дл� ветки:\n  %s\nСтроки, начинающие�� � «%c» будут вырезаны.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Общие параметры"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "показывать х�ш-�умму и тему, укажите дважды дл� выше�то�щей ветки"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "не выводить информационные �ообщени�"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "у�тановить режим от�леживани� выше�то�щей ветки (�м. git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "изменить информацию о выше�то�щей ветке"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "не и�пользуйте"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "выше�то�ща�"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "изменить информацию о выше�то�щей ветке"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "Убрать информацию о выше�то�щей ветке"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "и�пользовать цветной вывод"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "выполнить дей�тви� на от�леживаемых внешних ветках"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "вывод только веток, которые �одержат коммит"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "вывод только веток, которые не �одержат коммит"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Специфичные дл� git-branch дей�тви�:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "показать �пи�ок и от�леживаемых и локальных веток"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "удалить полно�тью �литую ветку"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "удалить ветку (даже никуда не �литую)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "переме�тить/переименовать ветки и ее журнал ��ылок"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "переме�тить/переименовать ветку, даже е�ли целевое им� уже �уще�твует"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "�копировать ветку и её журнал ��ылок"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "�копировать ветку, даже е�ли целевое им� уже �уще�твует"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "показать �пи�ок имен веток"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "�оздать журнал ��ылок ветки"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "изменить опи�ание ветки"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "принудительное �оздание, перемещение или удаление ветки"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "вывод только �литых веток"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "вывод только не �литых веток"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "показать �пи�ок веток по �толбцам"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "ключ"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "им� пол�, по которому выполнить �ортировку"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "объект"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "вывод только веток, определенного объекта"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "�ортировка и фильтраци� не зави��т от реги�тра"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "и�пользовать формат дл� вывода"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "�е удало�ь определить HEAD как дей�твительную ��ылку."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не найден в refs/heads!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column и --verbose нельз� и�пользовать одновременно"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "требует�� им� ветки"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "�ельз� дать опи�ание отделённому HEAD"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "нельз� изменить опи�ание более одной ветки за раз"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Еще нет коммита на ветке «%s»."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "�ет ветки � именем «%s»."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "�лишком много веток дл� операции переименовани�"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "�лишком много веток дл� операции копировани�"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "�лишком много веток дл� указани� новых выше�то�щих"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "�лишком много аргументов дл� операции переименовани�"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "�лишком много аргументов дл� указани� новой выше�то�щей ветки"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "невозможно у�тановить выше�то�щий репозиторий дл� HEAD на %s, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "нет такой ветки «%s»"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "ветка «%s» не �уще�твует"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "�лишком много веток дл� убирани� выше�то�щих"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "�лишком много аргументов дл� �бро�а указани� выше�то�щей ветки"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "невозможно убрать выше�то�щий репозиторий дл� HEAD, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Ветка «%s» не имеет информации о выше�то�щей ветке"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "не имеет �мы�ла �оздавать «HEAD» вручную"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "параметры -a и -r дл� «git branch» не имеют �мы�ла � указанием имени ветки"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using "
-"--track or --set-upstream-to\n"
-msgstr "Флаг --set-upstream у�тарел и будет удален в будущем. Вме�то него и�пользуйте --track или --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr "\nЕ�ли вы хотите, чтобы «%s» от�леживала «%s», �делайте �ледующее:\n\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr "опци� --set-upstream больше не поддерживает��. Вме�то неё и�пользуйте «--track» или «--set-upstream-to»"
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5437,75 +5549,75 @@ msgstr "Требует�� репозиторий дл� �оздани� пак
 msgid "Need a repository to unbundle."
 msgstr "Требует�� репозиторий дл� ра�паковки."
 
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
 msgid ""
 "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 | <тип> | --textconv | --filters) [--path=<путь>] <объект>"
 
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
 "--filters]"
 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<тип> может быть одним из: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "показать тип объекта"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "показать размер объекта"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "выйти � нулевым кодом возврата, е�ли нет ошибки"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "�труктурированный вывод �одержимого объекта"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "for blob objects, run textconv on object's content"
 msgstr "запу�тить texconv на �одержимом двоичных объектов "
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run filters on object's content"
 msgstr "запу�к фильтров на �одержимом двоичных объектов "
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "двоичный объект"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "и�пользовать определенный путь дл� --textconv/--filters"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "разрешить -s и -t работать � повреждёнными объектами"
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "буфферировать вывод --batch"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "show info and content of objects fed from the standard input"
 msgstr "показать информацию и �одержимое объектов, переданных из �тандартного ввода"
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 msgid "show info about objects fed from the standard input"
 msgstr "показать информацию об объектах, переданных из �тандартного ввода"
 
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "переходить по �имвольным ��ылкам внутри дерева (и�пользует�� � опци�ми --batch и --batch-check)"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "показать в�е объекты � опци�ми --batch или --batch-check"
 
@@ -5533,7 +5645,7 @@ msgstr "прочитать имена файлов из �тандартного
 msgid "terminate input and output records by a NUL character"
 msgstr "окончание ввода и вывода запи�ей по �УЛЕВОМУ �имволу"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "не выводить прогре�� выполнени�"
 
@@ -5623,9 +5735,9 @@ msgid "write the content to temporary files"
 msgstr "запи�ать �одержимое во временные файлы"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "�трока"
 
@@ -5696,54 +5808,54 @@ msgstr "Ð�ельзÑ� обновлÑ�Ñ‚ÑŒ пути и переключатьÑ�Ñ� Ð
 msgid "path '%s' is unmerged"
 msgstr "путь «%s» не �лит"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "�начала нужно разрешить конфликты в вашем текущем индек�е"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�е удало�ь �оздать журнал ��ылок дл� «%s»: %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD �ейча� на"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "не удало�ь обновить HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Сбро� ветки «%s»\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Уже на «%s»\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Переключение и �бро� ветки «%s»\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Переключено на новую ветку «%s»\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Переключено на ветку «%s»\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … и еще %d.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -5760,7 +5872,7 @@ msgstr[1] "Предупреждение: вы о�тавл�ете позади
 msgstr[2] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 msgstr[3] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5779,160 +5891,160 @@ msgstr[1] "Е�ли вы хотите �охранить их � помощью
 msgstr[2] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 msgstr[3] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "внутренн�� ошибка при хождении по редакци�м"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "Предыдуща� позици� HEAD была"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "Вы находите�ь на еще не �озданной ветке"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "ожидает�� только одна ��ылка, а передано %d."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправильна� ��ылка: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "в дереве нет такой ��ылки: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "нельз� и�пользовать пути при переключении веток"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "нельз� и�пользовать «%s» при переключении веток"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» нельз� и�пользовать одновременно � «%s»"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�ельз� переключить ветку на не коммит «%s»"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "ветка"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "�оздать и переключить�� на новую ветку"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "�оздать/�бро�ить и перключить�� на новую ветку"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "�оздать журнал ��ылок дл� новой ветки"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "от�оединить HEAD на указанном коммите"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "у�тановить информацию о выше�то�щей ветке дл� новой ветки"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "нова�-ветка"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "нова� ветка без родителей"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "переключить�� на нашу вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "переключить�� на их вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "принудительное переключение на �о�то�ние (отбра�ывает в�е локальные изменени�)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "выполнить трехходовое �ли�ние � новой веткой"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "обновить игнорируемые файлы (по умолчанию)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "�тиль"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "�тиль конфликтов �ли�ни� (merge или diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "не ограничивать �пецификаторы пути только ча�тичными запи��ми"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "пере�мотр «git checkout <нет-такой-ветки>»"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 msgid "do not check if another worktree is holding the given ref"
 msgstr "не провер�ть, что другое дерево уже �одержит указанную ��ылку"
 
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "принудительно выводить прогре��"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B и --orphan нельз� и�пользовать одновременно"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track требует им� ветки"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Пропущено им� ветки; попробуйте -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "недопу�тимый �пецификатор пути"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "«%s» не �вл�ет�� коммитом, по�тому невозможно �оздать из него ветку «%s»"
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -5968,7 +6080,7 @@ msgstr "Будет пропущен репозиторий %s\n"
 msgid "failed to remove %s"
 msgstr "�бой удалени� %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5977,7 +6089,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr "Справка по выделению:\n1          - выбрать указанный �лемент\nfoo        - выбрать �лемент � указанным префик�ом\n           - (пу�то) не выбирать ничего\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5990,38 +6102,38 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr "Справка по выделению:\n1          - выбрать один �лемент\n3-5        - выбрать диапазон �лементов\n2-3,6-9    - выбрать не�колько диапазонов\nfoo        - выбрать �лемент � указанным префик�ом\n-…       - убрать выделение � указанных �лементов\n*          - выбрать в�е �лементы\n           - (пу�то) завершить выделение\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Хм (%s)?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблоны игнорировани� ввода>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �е удало�ь найти �лементы �оответ�твующие: %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Укажите �лементы дл� удалени�"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Удалить %s [y - да/N - нет]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "До �видани�.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6032,15 +6144,15 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr "clean               - начать очи�тку\nfilter by pattern   - и�ключить удаление �лементов\nselect by numbers   - и�ключить удаление �лементов по номерам\nask each            - запрашивать подтверждение на удаление каждого �лемента (как «rm -i»)\nquit                - прекратить очи�тку\nhelp                - �тот �кран\n?                   - �правка по выделению"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Команды ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Что теперь"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Удалить �ледующие �лементы:"
@@ -6048,372 +6160,372 @@ msgstr[1] "Удалить �ледующие �лементы:"
 msgstr[2] "Удалить �ледующие �лементы:"
 msgstr[3] "Удалить �ледующие �лементы:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Больше нет файлов дл� очи�тки, выходим."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "не выводить имена удал�емых файлов"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "принудительно"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "интерактивна� очи�тка"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "удалить каталоги полно�тью"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "шаблон"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "добавить <шаблон> в правила игнорировани�"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "также удалить игнорируемые файлы"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "удалить только игнорируемые файлы"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "нельз� и�пользовать одновременно -x и -X"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
 " clean"
 msgstr "clean.requireForce у�тановлен как true и ни одна из опций -i, -n или -f не указана; отказ очи�тки"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr "clean.requireForce у�тановлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очи�тки"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "не переключать рабочую копию на HEAD"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "�оздать голый репозиторий"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "�оздать зеркало репозитори� (включает в �еб� и параметр bare)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "дл� клонировани� из локального репозитори�"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "не и�пользовать же�ткие ��ылки, в�егда копировать файлы"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "на�троить как общедо�тупный репозиторий"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "�пецификатор-пути"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "инициализировать подмодули в клоне"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "количе�тво подмодулей, которые будут клонированы парралельно"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "каталог-шаблонов"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "каталог, шаблоны из которого будут и�пользованы"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "��ылаемый репозиторий"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "и�пользуйте --reference только при клонировании"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "им�"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "и�пользовать <им�> вме�то «origin» дл� от�леживани� выше�то�щего репозитори�"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "переключить�� на <ветку>, вме�то HEAD внешнего репозитори�"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "путь к git-upload-pack на внешнем репозитории"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "глубина"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "�делать ча�тичный клон указанной глубины"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "врем�"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "�делать ча�тичный клон до определенного времени"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "редакци�"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "углубить и�торию ча�тичного клона и�ключа� редакцию"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "клонировать только одну ветку, HEAD или --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "не клонировать метки, а также на�троить, чтобы не клонировали�ь и в дальнейшем"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "в�е �клонированные подмодули будут ча�тичными клонами"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "каталог-git"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "разме�тить каталог git отдельно от рабочей копии"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "у�тановить параметры внутри нового репозитори�"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "и�пользовать только IPv4 адре�а"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "и�пользовать только IPv6 адре�а"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr "Им� каталога не может быть угадано.\nУкажите им� каталога � помощью параметра командной �троки"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "информаци�: �е удало�ь добавить альтернативу дл� «%s»: %s\n"
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "не удало�ь открыть «%s»"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s уже �уще�твует и не �вл�ет�� каталогом"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не удало�ь выполнить stat %s\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "не удало�ь �оздать ��ылку «%s»"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "не удало�ь копировать файл в «%s»"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 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 "Клонирование прошло у�пешно, но во врем� переключени� �о�то�ни� произошла ошибка.\nС помощь команды «git status» вы можете про�мотреть, какие файлы были обновлены, а повторить попытку переключени� на ветку � помощью «git checkout -f HEAD»\n"
 
-#: builtin/clone.c:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�е удало�ь найти внешнюю ветку %s дл� клонировани�."
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "внешний репозиторий при�лал не в�е необходимые объекты"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "не удало�ь обновить %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "внешний HEAD ��ылает�� на не�уще�твующую ��ылку, нельз� переключить�� на такую вер�ию.\n"
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "не удало�ь переключить�� на вер�ию в рабочем каталоге"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "не удало�ь запи�ать параметры в файл конфигурации"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "не удало�ь выполнить перепаковку дл� очи�тки"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "не удало�ь от�оединить временные альтернативные файлы"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Слишком много аргументов."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Вы должны указать репозиторий дл� клонировани�."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare и --origin %s нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare и --separate-git-dir нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "репозиторий «%s» не �уще�твует"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "глубина %s не �вл�ет�� положительным чи�лом"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевой путь «%s» уже �уще�твует и не �вл�ет�� пу�тым каталогом."
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "рабочий каталог «%s» уже �уще�твует."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "не удало�ь �оздать родитель�кие каталоги дл� «%s»"
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "не удало�ь �оздать рабочий каталог «%s»"
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клонирование в голый репозиторий «%s»…\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клонирование в «%s»…\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-"
 "if-able"
 msgstr "клонирование � параметром --recursive нельз� и�пользовать одновременно ни � --reference, ни � --reference-if-able"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth игнорирует�� на локальных клонах; вме�то �того и�пользуйте file://."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since игнорирует�� на локальных клонах; и�пользуйте file:// вме�то �того."
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude игнорирует�� на локальных клонах; и�пользуйте file:// вме�то �того."
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "и�ходный репозиторий �вл�ет�� ча�тичным, --local игнорирует��"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local игнорирует��"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�е знаю как клонировать %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Внешн�� ветка %s не найдена в выше�то�щем репозитории %s"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Похоже, что вы клонировали пу�той репозиторий."
 
@@ -6516,98 +6628,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr "Е�ли вы хотите пропу�тит �тот коммит, и�пользуйте команду:\n\n    git reset\n\nПо�ле �того «git cherry-pick --continue» продолжит копирование о�тавших�� коммитов.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "�бой ра�паковки объекта дерева HEAD"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "не удало�ь �оздать временный индек�"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "�бой интерактивного добавлени�"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "не удало�ь обновить временный индек�"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "Сбой при обновлении о�новного к�ша дерева"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "не удало�ь запи�ать файл new_index"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "нельз� �оздать ча�тичный коммит во врем� �ли�ни�."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "нельз� �оздать ча�тичный коммит во врем� копировани� коммита."
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "не удало�ь прочитать индек�"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "не удало�ь запи�ать временный файл индек�а"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "у коммита «%s» от�ут�твует автор в заголовке"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "у коммита «%s» �трока автора в неправильном формате"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "параметр --author в неправильном формате"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "нельз� выбрать �имвол комментари�, который\nне и�пользует�� в текущем �ообщении коммита"
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "не удало�ь запро�ить коммит %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(чтение файла журнала из �тандартного ввода)\n"
 
-#: builtin/commit.c:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "не удало�ь прочитать файл журнала из �тандартного ввода"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "не удало�ь прочитать файл журнала «%s»"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "не удало�ь прочитать SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "не удало�ь прочитать MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "не удало�ь запи�ать шаблон опи�ани� коммита"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -6617,7 +6729,7 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаете�ь закоммитить �ли�ние.\nЕ�ли �то ошибка, пожалуй�та удалите файл\n\t%s\nи попробуйте �нова.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6627,14 +6739,14 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаете�ь закоммитить при копировании коммита.\nЕ�ли �то не так, то удалите файл\n\t%s\nи попробуйте �нова.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, 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 "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут проигнорированы, а пу�тое �ообщение\nотмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6642,341 +6754,342 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут о�тавлены; вы можете удалить их вручную,\nе�ли хотите. Пу�тое �ообщение отмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:     %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:      %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sКоммитер:  %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "�е удало�ь прочитать индек�"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Ошибка при по�троении деревьев"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Пожалуй�та, укажите �ообщение, при указании опций -m или -F.\n"
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author «%s» не в формате «Им� <почта>» и не �овпадает � �уще�твующим автором"
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправильный режим неот�леживаемых файлов «%s»"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long и -z нельз� и�пользовать одновременно"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Указание одновременно опций --reset-author и --author не имеет �мы�ла"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "�ечего и�правл�ть."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Вы в проце��е �ли�ни� —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Вы в проце��е копировани� коммита —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опции --squash и --fixup не могут и�пользовать�� одновременно"
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Может и�пользовать�� только одна из опций -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Опци� -m не может и�пользовать�� � -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author может и�пользовать�� только одновременно � опци�ми -C, -c или --amend."
 
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Может и�пользовать�� только одна из опций --include/--only/--all/--interactive/--patch."
 
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr "Указание путей каталогов � опци�ми --include/--only не имеет �мы�ла."
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�еправильное значение режима очи�тки %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "С опцией -a указание пути не имеет �мы�ла."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "кратко показать �тату�"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "показать информацию о вер�ии"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "показать информацию о �пр�танном"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "машиночитаемый вывод"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "показать �тату� в длинном формате (по умолчанию)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "завершать запи�и �УЛЕВЫМ байтом"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "режим"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "показать неот�леживаемые файлы, опциональные режимы: all (в�е), normal (как обычно), no (нет). (По умолчанию: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "показать игнорируемые файлы"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "когда"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr "игнорировать изменени� в подмодул�х, опционально когда: all (в�егда), dirty (измененные), untracked (неот�леживаемые). (По умолчанию: all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "показать неот�леживаемые файлы по �толбцам"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "нельз� запро�ить ново�озданный коммит"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "нельз� разобрать ново�озданный коммит"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "отделённый HEAD"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (корневой коммит)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "не выводить �водку по�ле у�пешного коммита"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "добавить �пи�ок изменений в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Опции �ообщени� коммита"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "прочитать �ообщение из файла"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "автор"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "подменить автора коммита"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "дата"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "подменить дату коммита"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "�ообщение"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "�ообщение коммита"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "коммит"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "и�пользовать и отредактировать �ообщение от указанного коммита"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "и�пользовать �ообщение указанного коммита"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� и�правлени� указанного коммита"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� уплотнени� указанного коммита"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "коммит теперь за моим автор�твом (и�пользует�� � -C/-c/--amend)"
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "добавить Signed-off-by:"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "и�пользовать указанный файл шаблона"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "принудительно редактировать коммит"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "по-умолчанию"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "как удал�ть пробелы и #комментарии из �ообщени� коммита"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "включить �тату� файлов в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "подпи�ать коммит � помощью GPG"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Опции �одержимого коммита"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "закоммитить в�е измененные файлы"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "добавить указанные файлы в индек� дл� коммита"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "интерактивное добавление файлов"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "интерактивное добавление изменений"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "закоммитить только указанные файлы"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "пропу�тить перехватчик pre-commit и commit-msg"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "показать, что будет закоммичено"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "и�править предыдущий коммит"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "пропу�тить перехватчик post-rewrite"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "разрешить запи�ь пу�того коммита"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "разрешить запи�ь изменений � пу�тым �ообщением"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "не удало�ь разобрать HEAD коммит"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Файл MERGE_HEAD поврежден (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "не удало�ь прочитать MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "не удало�ь открыть �ообщение коммита: %s"
 
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Отмена коммита; вы не изменили �ообщение.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Отмена коммита из-за пу�того �ообщени� коммита.\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Отмена коммита; вы не изменили �ообщение.\n"
+
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7133,23 +7246,23 @@ msgstr "# Это файл конфигурации пользовател� Git.
 msgid "--local can only be used inside a git repository"
 msgstr "--local можно и�пользовать только внутри git репозитори�"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "не удало�ь �оздать файл конфигурации %s"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr "нельз� перезапи�ать не�колько значений одним\n       И�пользуйте регул�рные выражени�, параметры --add или --replace-all, чтобы изменить %s."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "вывод размеров в удобочитаемом дл� человека виде"
 
@@ -7173,141 +7286,141 @@ msgstr "легкове�ный"
 msgid "annotated"
 msgstr "аннотированный"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "аннотированна� метка %s не до�тупна"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "аннотированна� метка %s не �одержит в�троенного названи�"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "метка «%s» уже зде�ь «%s»"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�едопу�тимое им� объекта %s"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s не �вл�ет�� дей�твительным объектом «%s»"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "нет меток, точно �оответ�твующих «%s»"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "пои�к опи�ани� дл� %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "пои�к окончен на %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr "�ет аннотированных меток, которые могут опи�ать «%s».\n�о имеют�� неаннотированные метки: попробуйте добавить параметр --tags."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr "�ет меток, которые могут опи�ать «%s….\nПопробуйте добавить параметр --always или �оздать какие-нибудь метки."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "по�ещено %lu коммитов\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr "более %i меток найдено; показано по�ледние %i\nо�тановлен пои�к по�ле %s\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "пои�к метки, котора� идет по�ле коммита"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "вывод отладочной информации �тратегии пои�ка на �тандартный вывод"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "и�пользовать любую ��ылку"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "и�пользовать любую метку, даже неаннотированную"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "в�егда и�пользовать длинный формат вывода"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "�ледовать только за первым родителем"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "выводить только точные �овпадени�"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "ра��матривать по�ледние <n> меток (по умолчанию: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "ра��матривать только метки по <шаблону>"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "не учитывать метки, которые �оответ�твуют <шаблону>"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "е�ли не найдено, показать �окращенный номер редакции коммита"
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "пометка"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long не�овме�тимо � --abbrev=0"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "Имена не найдены, не могу ничего опи�ать."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty не�овме�тимо � указанием указателей коммитов"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken не�овме�тимо � указанием указателей коммитов"
 
@@ -7321,21 +7434,21 @@ msgstr "«%s»: не Ñ�влÑ�етÑ�Ñ� обычным файлом или Ñ�имÐ
 msgid "invalid option: %s"
 msgstr "неправильный параметр: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "�е найден git репозитоий"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "передан неправильный объект «%s»."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "передано больше двух двоичных объектов: «%s»"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "передан необработанный объект «%s»."
@@ -7344,97 +7457,97 @@ msgstr "передан необработанный объект «%s»."
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "�бой: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "не удало�ь прочитать �имвольную ��ылку %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "не удало�ь прочитать файл �имвольной ��ылки %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "не удало�ь прочитать объект %s дл� �имвольной ��ылки %s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживают�� в режиме �равнени� каталогов(«-d» и «--dir-diff»)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "оба файла изменены: «%s» и «%s»."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "рабочий каталог был покинут."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "временные файлы уже наход�т�� в «%s»."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "возможно вы хотите их удалить или во��тановить."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "и�пользовать «diff.guitool» вме�то «diff.tool»"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "выполнить пофайловое �равнение в�его каталога"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "не �прашивать перед запу�ком утилиты �равнени�"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "и�пользовать �имвольные ��ылки в режиме �равнени� каталога"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<утилита>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "и�пользовать указанную утилиту �равнени�"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "выве�ти �пи�ок утилит, которые можно и�пользовать � параметром «--tool»"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
 " code"
 msgstr "выходить из «git-difftool», е�ли вызванна� утилита �равнени� вернула не нулевой код возврата"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<команда>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "и�пользовать о�обую команду дл� про�мотра различий"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не передана <утилита> дл� --tool=<утилита>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не передана <команда> дл� --extcmd=<команда>"
 
@@ -7442,325 +7555,325 @@ msgstr "не передана <команда> дл� --extcmd=<команда>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [опции-rev-list]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "показать прогре�� по�ле <n> объектов"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "выбор обработки подпи�анных меток"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Запи�ать пометки в �тот файл"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "Импортировать пометки из �того файла"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "Подделать автора метки, е�ли у метки он от�ут�твует"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Выве�ти полное дерево дл� каждого коммита"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "И�пользовать пометку завершени� в конце потока"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Пропу�тить вывод данных двоичных объектов"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "�пецификатор ��ылки"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Применить �пецификатор ��ылки к �к�портируемым ��ылкам"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "�делать вывод анонимным"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<опции>] [<репозиторий> [<�пецификатор-��ылки>…]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<опции>] <группа>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<опции>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "извлечь �о в�ех внешних репозиториев"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "допи�ать к .git/FETCH_HEAD вме�то перезапи�и"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "путь к программе упаковки пакета на машине � внешним репозиторием"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "принудительна� перезапи�ь локальной ветки"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "извлечь � не�кольких внешних репозиториев"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "извлечь в�е метки и �в�занные объекты"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "не извлекать в�е метки (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "количе�тво подмодулей, которые будут �качаны парралельно"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "почи�тить от�леживаемые внешние ветки, которых уже нет на внешнем репозитории"
 
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "по требованию"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "управление рекур�ивным извлечением подмодулей"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "о�тавить загруженный пакет данных"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "разрешить обновление ��ылки HEAD"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "улугубить и�торию ча�тичного клона"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "углубить и�торию ча�тичного клона о�новыва��ь на времени"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "преобразовать в полный репозиторий"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "каталог"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "при�оедин�ть �то �переди к выводу путей подмодул�"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "на�троить по умолчанию рекур�ивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "принимать ��ылки, которые обновл�ют .git/shallow"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "�оответ�твие-��ылок"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "указать �оответ�твие ��ылок при извлечении"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "�е удало�ь найти ��ылку HEAD на внешнем репозитории"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "опци� fetch.output �одержит неправильное значение дл� %s"
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "объект %s не найден"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[актуально]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[отклонено]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "нельз� извлечь текущую ветку"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[обновление метки]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "не удало�ь обновить локальную ��ылку"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[нова� метка]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[нова� ветка]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[нова� ��ылка]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "принудительное обновление"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "без перемотки вперед"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s не отправил в�е необходимые объекты\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "%s отклонено из-за того, что ча�тичные корни не разрешено обновл�ть"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "Из %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr "не удало�ь обновить некоторые локальные ��ылки; попробуйте запу�тить «git remote prune %s», чтобы почи�тить �тарые, конфликтующие ветки"
 
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s будет ви��щей веткой)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s �тала ви��щей веткой)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[удалено]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(нет)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Отказ получени� в текущую ветку %s не голого репозитори�"
 
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "�еправильное значение «%2$s» дл� параметра «%1$s» дл� %3$s"
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Параметр «%s» игнорирует�� дл� %s\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "�е знаю как извлечь � %s"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Извлечение из %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "�е удало�ь извлечь %s"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Вам нужно указать им� метки."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "Отрицательна� грубина дл� --deepen не поддерживает��"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen и --depth нельз� и�пользовать одновременно"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "нельз� и�пользовать одновременно --depth и --unshallow"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow не имеет �мы�ла на полном репозитории"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all не принимает им� репозитори� как аргумент"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all не имеет �мы�ла при указании �пецификаторов ��ылок"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "�ет такого внешнего репозитори� или группы: %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Получение группы и указание �пецификаций ��ылок не имеет �мы�ла"
 
@@ -7769,23 +7882,23 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <�ообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "отправить в журнал <n> запи�ей из короткого журнала"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "�окращение дл� --log (у�таревшее)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "тек�т"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "и�пользовать <тек�т> как начальное �ообщение"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "файл дл� чтени�"
 
@@ -7825,101 +7938,105 @@ msgstr "выводить указатели меÑ�та заполнениÑ� в Ð
 msgid "show only <n> matched refs"
 msgstr "показать только <n> �овпадающих ��ылок"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "и�пользовать цвета из формата"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "вывод только ��ылок, которые указывают на переданный объект"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "вывод только �литых ��ылок"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "вывод только не �литых ��ылок"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "вывод только ��ылок, которые �одержат коммит"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "вывод только ��ылок, которые не �одержат коммит"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "Проверка каталогов объектов"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<опции>] [<объект>…]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "показать недо�тупные объекты"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "показать объекты, на которые нет ��ылок"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "выве�ти отчет по меткам"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "выве�ти отчет по корневым узлам"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "во�принимать объекты в индек�е как корневые узлы"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "�оздать корневые узлы журналов ��ылок (по умолчанию)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "также провер�ть пакеты и альтернативные объекты"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "только проверить �оединение"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "и�пользовать более �трогую проверку"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "запи�ать объекты на которые нет ��ылок в .git/lost-found"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "показать прогре�� выполнени�"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "показать подробные имена дл� недо�тупных объектов"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "Проверка объектов"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<опции>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "�е удало�ь выполнить fstat %s: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "�е удало�ь выполнить stat дл� %s"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -7929,49 +8046,49 @@ msgid ""
 "%s"
 msgstr "По�ледний запу�к gc �ообщил �ледующее. Пожалуй�та, и�правьте ошибку и удалите %s.\n�втоматиче�ка� очи�тка репозитори� не будет производить��, пока �тот файл не удалён.\n\n%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "почи�тить объекты, на которые нет ��ылок"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "провер�ть более внимательно (занимает больше времени)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "включить режим auto-gc"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 msgid "force running gc even if there may be another gc running"
 msgstr "принудительно запу�тить gc, даже е�ть друга� копи� gc уже запущена"
 
-#: builtin/gc.c:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "�е удало�ь разобрать значение %s дл� gc.logexpiry"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "�втоматиче�ка� упаковка репозитори� в фоне, дл� оптимальной производительно�ти.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматиче�ка� упаковка репозитори�, дл� оптимальной производительно�ти.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Смотрите «git help gc» руковод�тва по ручной очи�тке.\n"
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, 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:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove "
 "them."
@@ -7981,12 +8098,12 @@ msgstr "Имеет�� �лишком много объектов, на кото
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<опции>] [-e] <шаблон> [<редакци�>…] [[--] <путь>…]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: �бой �оздани� потока: %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "указано недопу�тимое количе�тво потоков (%d) дл� %s"
@@ -7994,249 +8111,241 @@ msgstr "указано недопуÑ�тимое количеÑ�тво потокÐ
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "нет поддержки потоков, игнорирование %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "не удало�ь прочитать дерево (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не удало�ь выполнить grep из объекта типа %s"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "параметр «%c» ожидает чи�ловое значение"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "и�кать в индек�е, а не в рабочем каталоге"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "и�кать в �одержимом не управл�емым git"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "и�кать и в от�леживаемых, и в неот�леживаемых файлах"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнорировать файлы указанные в «.gitignore»"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "рекур�ивный пои�к по в�ем подмодул�м"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "базовое им�"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "добавить базовое им� проекта �переди ко в�ему выводимому"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "и�кать в не�овпадающих �троках"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "без учета реги�тра"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "и�кать �овпадени� шаблона только на границах �лов"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "обработка двоичных файлов как тек�та"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "не и�кать �овпадени� шаблона в двоичных файлах"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "обрабатывать�� двоичные файлы � помощью фильтров textconv"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "на глубине мак�иму <глубина> уровней"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "и�пользовать ра�ширенные регул�рные выражени� POSIX"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "и�пользовать базовые регул�рные выражени� POSIX (по умолчанию)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "интерпретировать шаблоны как фик�ированные �троки"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "и�пользовать Perl-�овме�тимые регул�рные выражени�"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "выве�ти номера �трок"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "не выводить имена файлов"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "выводить имена файлов"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "выводить имена файлов отно�ительно каталога репозитори�"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "выводить только имена файлов, а не �овпадающие �троки"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "�иноним дл� --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "выводить только не�овпадающие имена файлов"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "выводить двоичный �ОЛЬ по�ле �пи�ка имен файлов"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "выводить количе�тво �овпадений, а не �овпадающие �троки"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "под�вечивать �овпадени�"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "выводить пу�тую �троку по�ле �овпадений из разных файлов"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 msgid "show filename only once above matches from same file"
 msgstr "выводить им� файла только раз на не�колько �овпадений в одном файле"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "показать <n> �трок контек�та перед и по�ле �овпадени�"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "показать <n> �трок контек�та перед �овпадением"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "показать <n> �трок контек�та по�ле �овпадени�"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "и�пользовать <кол> рабочих потоков"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "тоже, что и -C КОЛИЧЕСТВО"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "показать �троку � именем функции перед �овпадением"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "показать окружающую функцию"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "прочитать шаблоны из файла"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "пои�к �оответ�твий � <шаблоном>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "объединить шаблоны указанные � помощью -e"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "ничего не выводить, указать на �овпадение � помощью кода выхода"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr "показать только �овпадени� из файлов в которых �овпадают в�е шаблоны"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "показать дерево разбора дл� выражени� пои�ка"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "пейджер"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "показать �овпадающие файлы � помощью программы-пейджера"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "разрешить вызов grep(1) (игнорирует�� в �той �борке)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "не задан шаблон."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index или --untracked нельз� и�пользовать одновременно � указанием ревизии"
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "не удало�ь определить редакцию: %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "указано неправильное количе�тво потоков (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "нет поддержки потоков, игнорирование --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager работает только в рабочем каталоге"
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "опци� не поддерживает�� одновременно � --recurse-submodules."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached или --untracked нельз� и�пользовать одновременно � --no-index."
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard не может и�пользовать�� дл� от�леживаемого �одержимого."
 
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "указано одновременно --cached и дерево."
 
@@ -8325,105 +8434,105 @@ msgstr "Сбой при определении вер�ии emacsclient."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "вер�и� emacsclient «%d» �лишком �тара� (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "�бой при запу�ке «%s»"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr "«%s»: путь дл� неподдерживаемой программы про�мотра man.\nВме�то �того и�пользуйте «man.<программа>.cmd»."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr "«%s»: команда дл� неподдерживаемой программы про�мотра man.\nВме�то �того и�пользуйте «man.<программа>.path»."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: неизве�тна� программа про�мотра man."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "программа про�мотра man не обработала запро�"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "программа про�мотра info не обработала запро�"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "Определение атрибутов дл� путей файлов или каталогов"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Пов�едневный Git � 20 командами или около того"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Гло��арий Git"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указание �пециально игнорируемых файлов"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "Определение �вой�тв подмодулей"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указание редакций и диапазонов дл� Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Учебное введение в Git (дл� вер�ии 1.5.1 или новее)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Обзор рекомендуемых по�ледовательно�тей выполн�емых дей�твий � Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "О�новные руковод�тва Git:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "«git %s» — �то �окращение дл� «%s»"
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» — �то �окращение дл� «%s»"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "и�пользование: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "не удало�ь открыть %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "не�оответ�твие типа объекта на %s"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "ожидаемый объект не получен на %s"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "объект %s: ожидаемый тип %s, получен %s"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -8432,73 +8541,73 @@ msgstr[1] "не удало�ь заполнить %d байта"
 msgstr[2] "не удало�ь заполнить %d байтов"
 msgstr[3] "не удало�ь заполнить %d байтов"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "неожиданный конец файла"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "ошибка чтени� ввода"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "и�пользовано больше байт, чем было до�тупно"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 msgid "pack too large for current definition of off_t"
 msgstr "пакет �лишком большой дл� текущего определени� off_t"
 
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "размер пакета превышает мак�имальный допу�тимый"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "не удало�ь �оздать «%s»"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "не удало�ь открыть файл пакета «%s»"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "не�оответ�твие подпи�и пакета"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "вер�и� пакета %<PRIu32> не поддерживает��"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "пакет �одержит плохой объект по �мещению %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "программа �жати� вернула %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "переполнение значени� �мещени� у базового объекта дельты"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "�мещение базовой дельты вышло за допу�тимые пределы"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "неизве�тный тип объекта %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "не удало�ь выполнить pread дл� файла пакета"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -8507,93 +8616,93 @@ msgstr[1] "преждевременное окончание файла паке
 msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов от�ут�твует"
 msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов от�ут�твует"
 
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "�ерьезное не�оответ�твие при ра�паковке"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "��ЙДЕ�� КОЛЛИЗИЯ SHA1 С %s !"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "не удало�ь прочитать %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "не удало�ь прочитать информацию �уще�твующего объекта %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "не удало�ь прочитать �уще�твующий объект %s"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправильный файл двоичного объекта %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "неправильный %s"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Ошибка в объекте"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "�е в�е дочерние объекты %s до�тижимы"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "�бой при применении дельты"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "Получение объектов"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Индек�ирование объектов"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакет поврежден (не�оответ�твие SHA1)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "не удало�ь выполнить fstat дл� файла пакета"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "файл пакета �одержит му�ор в конце"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "безумна� путаница в parse_pack_objects()"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "Определение изменений"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не удало�ь �оздать поток: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "безумна� путаница"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
@@ -8602,12 +8711,12 @@ msgstr[1] "завершено � %d локальными объектами"
 msgstr[2] "завершено � %d локальными объектами"
 msgstr[3] "завершено � %d локальными объектами"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "�еожиданна� контрольна� �умма в конце %s (ди�к поврежден?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -8616,54 +8725,54 @@ msgstr[1] "пакет Ñ�одержит %d неразрешенные дельтÑ
 msgstr[2] "пакет �одержит %d неразрешенных дельт"
 msgstr[3] "пакет �одержит %d неразрешенных дельт"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "нельз� �жать при�оединенный объект (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локальный объект %s поврежден"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "ошибка при закрытии файла пакета"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "не удало�ь запи�ать файл удержани� «%s»"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "не удало�ь закрыть запи�анный файл удержани� «%s»"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "не удало�ь �охранить файл пакета"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "не удало�ь �охранить файл индек�а"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "плохой pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл пакета «%s»"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл индек�а дл� «%s»"
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -8672,7 +8781,7 @@ msgstr[1] "не дельты: %d объекта"
 msgstr[2] "не дельты: %d объектов"
 msgstr[3] "не дельты: %d объектов"
 
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -8681,26 +8790,26 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
 msgstr[2] "длина цепочки = %d: %lu объектов"
 msgstr[3] "длина цепочки = %d: %lu объектов"
 
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "им� пакета «%s» не оканчивает�� на «.pack»"
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "плохой %s"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin нельз� и�пользовать без --stdin"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "опци� --stdin требует наличи� репозитори� git"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "--verify без указани� имени файла пакета"
 
@@ -8826,453 +8935,493 @@ msgid ""
 "<token>[(=|:)<value>])...] [<file>...]"
 msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "редактировать файлы на ме�те"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "удал�ть пу�тые завершители"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "где поме�тить новый завершитель"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "дей�твие, е�ли завершитель уже �уще�твует"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "дей�твие, е�ли завершитель не �уще�твует"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "выве�ти только завершители"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "не примен�ть правила из файла конфигурации"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "объединить значени� разделенные пробелом"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "указание опций разбора"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "завершитель"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "завершители дл� добавлени�"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer одновременно � --only-input не имеет �мы�ла"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "ничего не передано, дл� редактировани� файлов на ме�те"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<опции>] <объект>…"
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправильный параметр дл� --decorate: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "не выводить различи�"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "показать и�точник"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "И�пользовать файл �оответ�тви� почтовых адре�ов"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "опции формата вывода ��ылок"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Обработать диапазон �трок n,m из файла, начина� � 1"
 
-#: builtin/log.c:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Финальный вывод: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: плохой файл"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "�е удало�ь прочитать объект %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "�еизве�тный тип объекта: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "в format.headers не указано значение"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "�лишком длинное им� выходного каталога"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "�у удало�ь открыть файл изменений %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "�ужен только один диапазон."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "�е �вл�ет�� диапазоном."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "Сопроводительное пи�ьмо должно быть в формате �лектронной почты"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ошибка в поле in-reply-to: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<опции>] [<начина�-�> | <диапазон-редакций>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Два выходных каталога?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "�еизве�тный коммит %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е удало�ь разрешить «%s» как ��ылку."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "�е удало�ь найти точную базу �ли�ни�."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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 "�е удало�ь получить выше�то�щую ветку. Е�ли вы хотите запи�ать базовый коммит автомитиче�ки, то и�пользуйте git branch --set-upstream-to дл� от�леживани� внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "�е удало�ь найти точную базу �ли�ни�"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовый коммит должен быть предком �пи�ка редакций"
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "базовый коммит не должен быть в �пи�ке редакций"
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "не удало�ь получить идентификатор патча"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "выводить [PATCH n/m] даже когда один патч"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "выводить [PATCH] даже когда не�колько патчей"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "выводить патчи на �тандартный вывод"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
-msgstr "генерировать �опроводительное пи�ьмо"
+msgstr "�оздать �опроводительное пи�ьмо"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "и�пользовать про�тую по�ледовательно�ть чи�ел дл� имен выходных файлов"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "�уффик�"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "и�пользовать �уффик� <�уффик�> вме�то «.patch»"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "начать нумерацию патчей � <n>, а не � 1"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "пометить �ерию как �нную попытку"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "И�пользовать [RFC PATCH] вме�то [PATCH]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "И�пользовать [<префик�>] вме�то [PATCH]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "�охранить результирующие файлы в <каталог>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "не обрезать/добавл�ть [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "не выводить двоичные различи�"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "выводить нулевую х�ш-�умму в заголовке From"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "не включать патч, е�ли коммит уже е�ть в выше�то�щей ветке"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr "выводить в формате патча, а не в �тандартном (патч + �тати�тика)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "Передача �ообщений"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "заголовок"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "добавить заголовок �ообщени�"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "почта"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "добавить заголовок To:"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "добавить заголовок Cc:"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "идентификатор"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "у�тановить адре� отправител� на <идентификатор> (или на идентификатор коммитера, е�ли от�ут�твует)"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "идентификатор-�ообщени�"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "�делать первое пи�ьмо ответом на <идентификатор-�ообщени�>"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "вложение"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "приложить патч"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "включить патч в тек�т пи�ьма"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "включить в пи�ьмах иерархично�ть, �тили: shallow (ча�тичную), deep (глубокую)"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "подпи�ь"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "добавить подпи�ь"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "базовый коммит"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "добавить информацию о требовании дерева к �ерии патчей"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "добавить подпи�ь из файла"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "не выводить имена файлов патчей"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "показать прогре�� выполнени� во �оздани� патчей"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "неправильна� �трока идентификации: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n и -k нельз� и�пользовать одновременно"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc и -k нельз� и�пользовать одновременно."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only не имеет �мы�ла"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status не имеет �мы�ла"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check не имеет �мы�ла"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "�тандартный вывод или каталог?"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "�е удало�ь �оздать каталог «%s»"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "не удало�ь прочитать файл подпи�и «%s»"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Создание патчей"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "Сбой при �оздании выходных файлов"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<выше�то�ща�-ветка> [<голова> [<ограничение>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> "
 "manually.\n"
 msgstr "�е удало�ь найти от�леживаемую внешнюю ветку, укажите <выше�то�щую-ветку> вручную.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<опции>] [<файл>…]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "выводить имена файлов � метками"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "и�пользовать �имволы в нижнем реги�тре дл� «предположительно без изменений» файлов"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "показывать к�шированные файлы при выводе (по умолчанию)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "показывать удаленные файлы при выводе"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "показывать измененные файлы при выводе"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "показывать другие файлы при выводе"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "показывать игнорируемые файлы при выводе"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "показывать им� индек�ированного объекта на выводе"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "показывать файлы в файловой �и�теме, которые должны быть удалены"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "показывать только имена у «других» каталогов"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "показать концы �трок файлов"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "не показывать пу�тые каталоги"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "показывать не �литые файлы на выводе"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "показывать информации о разрешении конфликтов и отмене"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "пропу�тить файлы, �оответ�твующие шаблону"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "прочитать шаблоны и�ключени� из <файл>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "прочитать дополнительные покаталожные шаблоны и�ключени� из <файл>"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "добавить �тандартные и�ключени� git"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "выводить пути отно�ительно корневого каталога проекта"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "рекур�ивно по подмодул�м"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "е�ли какой-либо <файл> не в индек�е, �читать �то ошибкой"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "указатель-дерева"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "притворить��, что пути удалены, т.к. <указатель-дерева> еще �уще�твует"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "показать отладочную информацию"
 
@@ -9360,176 +9509,180 @@ msgstr "выве�ти полное дерево; не только текущи
 msgid "empty mbox: '%s'"
 msgstr "пу�той mbox: «%s»"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<опции>] [<коммит>…]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "при указании параметра «m» требует�� указать значение"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�е удало�ь найти �тратегию �ли�ни� «%s».\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "До�тупные �тратегии:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "До�тупные пользователь�кие �тратегии:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "не выводить �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "выве�ти �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(�иноним дл� --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "добавить (мак�имум <n>) запи�ей из короткого журнала в �ообщение коммита у �ли�ни�"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "�оздать один коммит, вме�то выполнени� �ли�ни�"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "�делать коммит, е�ли �ли�ние прошло у�пешно (по умолчанию)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "отредактировать �ообщение перед выполнением коммита"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "разрешить перемотку вперед (по умолчанию)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "отменить выполнение �ли�ни�, е�ли перемотка вперед невозможна"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверить, что указанный коммит имеет верную �лектронную подпи�ь GPG"
 
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "�тратеги�"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "и�пользуема� �тратеги� �ли�ни�"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "опци�=значение"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "опции дл� выбранной �тратегии �ли�ни�"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�ообщение коммита дл� �ли�ни� (дл� �ли�ни� без перемотки вперед)"
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "отменить выполнение прои�ход�щего �ли�ни�"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "продолжить выполнение прои�ход�щего �ли�ни�"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "разрешить �ли�ние не�в�занных и�торий изменений"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "проверить перехватчик commit-msg"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "не удало�ь выполнить stash."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "�бой при выполнении stash"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправильный объект: %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "�бой при выполнении read-tree"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (нечего уплотн�ть)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Уплотнение коммита — не обновл�� HEAD\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "�ет �ообщени� �ли�ни� — не обновл�ем HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» не указывает на коммит"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправильна� �трока branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "�е обрабатываю ничего, кроме �ли�ни� двух указателей на ветки."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�еизве�тный параметр merge-recursive: -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "не удало�ь запи�ать %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�е удало�ь проче�ть из «%s»"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "�е выполн�ю коммит �ли�ни�; и�пользуйте «git commit» дл� завершени� �ли�ни�.\n"
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9539,185 +9692,185 @@ msgid ""
 "the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита, дл� объ��нени�, зачем нужно\n�то �ли�ние, о�обенно, е�ли �то �ли�ние обновленной выше�то�щей\nветки в тематиче�кую ветку.\n\nСтроки, начинающие�� � «%c» будут проигнорированы, а пу�тое\n�ообщение отмен�ет проце�� коммита.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Пу�тое �ообщение коммита."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Прекра�но.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�е удало�ь прове�ти автоматиче�кое �ли�ние; и�правьте конфликты и �делайте коммит результата.\n"
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "�ет текущей ветки."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "У текущей ветки нет внешнего репозитори�."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr "Дл� текущей ветки не указана выше�то�ща� ветка по умолчанию."
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�е указана внешн�� от�леживаема� ветка дл� %s на %s"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Плохое значение «%s» в переменной окружени� «%s»"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не �вл�ет�� тем, что можно �лить в %s: %s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "не �вл�ет�� тем, что можно �лить"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "опци� --abort не принимает аргументы"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "�ет �ли�ни�, которое можно отменить (от�ут�твует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "опци� --continue не принимает аргументы"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Сейча� не прои�ходит �ли�ние (от�ут�твует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед �ли�нием."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили копирование коммита (при�ут�твует файл CHERRY_PICK_HEAD).\nПожалуй�та, закоммитьте ваши изменени�, перед �ли�нием."
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Вы не завершили копирование коммита (при�ут�твует файл CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "�ельз� и�пользовать одновременно --squash и --no-ff."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Коммит не указан и параметр merge.defaultToUpstream не у�тановлен."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "Уплотнение коммита в пу�тую ветку еще не поддерживает��"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Коммит, не �вл�ющий�� перемоткой вперед, нет �мы�ла делать в пу�тую ветку."
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s не �вл�ет�� тем, что можно �лить"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можно только один коммит в пу�тую ветку."
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Коммит %s �одержит не доверенную GPG подпи�ь, предположительно от %s."
 
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Коммит %s �одержит плохую GPG подпи�ь, предположительно от %s."
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Коммит %s не �одержит GPG подпи�ь."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Коммит %s �одержит дей�твительную GPG подпи�ь, от %s.\n"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "отказ �ли�ни� не�в�занных и�торий изменений"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Уже обновлено."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновление %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Попытка тривиального �ли�ни� в индек�е…\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "�е вышло.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Уже обновлено. Круто!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "Перемотка вперед невозможна, отмена."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Перемотка дерева к и�ходному �о�то�нию…\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Попытка �ли�ни� � помощью �тратегии %s…\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�и одна �тратеги� �ли�ни� не обработала �ли�ние.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Сбой при �ли�нии � помощью �тратегии %s.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "И�пользую %s дл� подготовки ручного разрешени� конфликтов.\n"
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�втоматиче�кое �ли�ние прошло у�пешно; как и запрашивали, о�тановлено перед выполнением коммита\n"
@@ -9858,7 +10011,7 @@ msgstr "git mv [<опции>] <и�точник>… <назначение>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Каталог %s в индек�е и не �вл�ет�� подмодулем?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "Чтобы продолжить, проиндек�ируйте или �пр�чьте ваши изменени� в файле .gitmodules"
 
@@ -9875,68 +10028,68 @@ msgstr "принудительно перемещать/переименоват
 msgid "skip move/rename errors"
 msgstr "пропу�кать ошибки при перемещении/переименовании"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целевой путь «%s» не �вл�ет�� каталогом"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка переименовани� из «%s» в «%s»\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "плохой и�точник"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "нельз� переме�тить каталог в �амого �еб�"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "нельз� переме�тить каталог в файл"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "и�ходный каталог пу�т"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "не под вер�ионным контролем"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "целевой путь уже �уще�твует"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "перезапи�ь «%s»"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "�е удало�ь перезапи�ать"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "не�колько и�точников дл� одного целевого пути"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "целевой каталог не �уще�твует"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, откуда=%s, куда=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Переименование %s в %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�бой при переименовании «%s»"
@@ -10121,19 +10274,19 @@ msgstr "не удало�ь запи�ать объект заметки"
 msgid "the note contents have been left in %s"
 msgstr "�одержимое заметки о�тало�ь в %s"
 
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "не удало�ь прочитать «%s»"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "не удало�ь открыть или прочитать «%s»"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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» как ��ылку."
@@ -10160,185 +10313,185 @@ msgstr "не удало�ь �копировать заметку из «%s» в
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "отказ в перезапи�и %s заметок в %s (за пределами refs/notes/)"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "передано �лишком много параметров"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "не найдена заметка дл� объекта %s."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "тек�товое �одержимое заметки"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "�одержимое заметки в файле"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "и�пользовать и отредактировать указанный объект заметки"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "и�пользовать указанный объект заметки"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "разрешить �охранение пу�той заметки"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "заменить �уще�твующие заметки"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�е удало�ь добавить заметку. �айдена �уще�твующа� заметка у объекта %s. И�пользуйте параметр «-f» дл� перезапи�и �уще�твующих заметок."
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Перезапи�ь �уще�твующих заметок у объекта %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Удаление заметки у объекта %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "прочитать объекты из �тандартного ввода"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "загрузить на�тройки перезапи�и дл� команды <команда> (включает в �еб� --stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "передано �лишком мало параметров"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
 " existing notes"
 msgstr "�е удало�ь �копировать заметку. �айдена �уще�твующа� заметка у объекта %s. И�пользуйте параметр «-f» дл� перезапи�и �уще�твующих заметок."
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "нет заметок у и�ходного объекта %s. �ельз� �копировать."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr "Опции -m/-F/-c/-C дл� подкоманды «edit» у�тарели.\nИ�пользуйте вме�то них «git notes add -f -m/-F/-c/-C».\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "не удало�ь удалить ��ылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "не удало�ь удалить ��ылку NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "не удало�ь удалить рабочий каталог «git notes merge»"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "не удало�ь прочитать ��ылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "не удало�ь найти коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "не удало�ь разобрать коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не удало�ь разрешить NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "не удало�ь завершить �линие заметок"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "неизве�тна� �тратеги� �ли�ни� заметок %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Общие опции"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Опции �ли�ни�"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy "
 "(manual/ours/theirs/union/cat_sort_uniq)"
 msgstr "разрешить конфликты заметок � помощью указанной �тратегии (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "Коммит не �литых заметок"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завершить �ли�ние заметок коммитом не �литых заметок"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Отмена разрешени� �ли�ни� заметок"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "отменить �ли�ние заметок"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "нельз� и�пользовать одновременно --commit, --abort и -s/--strategy"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "вы должны указать ��ылку заметки дл� �ли�ни�"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизве�тный параметр дл� -s/--strategy: %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "�ли�ние заметок в %s уже выполн�ет�� на %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не удало�ь �охранить адре� текущей ��ылки на заметку (%s)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with"
@@ -10346,218 +10499,218 @@ msgid ""
 "--abort'.\n"
 msgstr "�е удало�ь автоматиче�ки �лить заметки. И�правьте конфликты в %s и закоммитьте результат � помощью «git notes merge --commit», или прервите проце�� �ли�ни� � помощью «git notes merge --abort».\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "У объекта %s нет заметки\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "попытка удалени� не�уще�твующей заметки не �вл�ет�� ошибкой"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "прочитать имена объектов из �тандартного ввода"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "не удал�ть, только показать �пи�ок"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "выве�ти �пи�ок удаленных заметок"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "��ылка-на-заметку"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "и�пользовать заметку из <��ылка-на-заметку>"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "неизве�тна� подкоманда: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<опции>…] [< <�пи�ок-��ылок> | < <�пи�ок-объектов>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<опции>…] <им�-базы> [< <�пи�ок-��ылок> | < <�пи�ок-объектов>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "ошибка �жати� (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "отключение запи�и битовых карт, так как карты были разбиты на ча�ти из-за pack.packSizeLimit"
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "Запи�ь объектов"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "отключение запи�и битовых карт, так как некоторые объекты не были упакованы"
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "Сжатие объектов"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдерживаема� вер�и� индек�а %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "плоха� вер�и� индек�а «%s»"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "не выводить прогре�� выполнени�"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "показать прогре�� выполнени�"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "показать прогре�� выполнени� во врем� запи�и объектов"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "похоже на --all-progress при включенном прогре��е выполнени�"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "вер�и�[,�мещение]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr "запи�ать файл индек�а пакета в указанной вер�ии формата"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "мак�имальный размер каждого выходного файла пакета"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнорировать чужие объекты, вз�тые из альтернативного хранилища объектов"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "игнорировать упакованные объекты"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "ограничить окно пакета по количе�тву объектов"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr "дополнительно к количе�тву объектов ограничить окно пакета по пам�ти"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "мак�имальна� разрешенна� длина цепочки дельт в результирующем пакете"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "и�пользовать повторно �уще�твующие дельты"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "и�пользовать повторно �уще�твующие объекты"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "и�пользовать объекты OFS_DELTA"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 msgid "use threads when searching for best delta matches"
 msgstr "и�пользовать многопоточно�ть при пои�ке лучших �овпадений дельт"
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "не �оздавать пу�тые выходные пакеты"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "прочитать аргументы редакций из �тандартного ввода"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничить�� объектами, которые еще не упакованы"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "включить объекты, которые до�тижимы по любой из ��ылок"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr "включить объекты, на которые ��ылают�� запи�и журнала ��ылок"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "включить объекты, на которые ��ылает�� индек�"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "выве�ти пакет на  �тандартный вывод"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr "включить объекты меток, которые ��ылают�� на упаковываемые объекты"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "�охран�ть ��ылки на недо�тупные объекты"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "паковать недо�тижимые объекты"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "ра�паковать недо�тупные объекты, которые новее, чем <врем�>"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "�оздавать тонкие пакеты"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "�оздавать пакеты, подход�щие дл� ча�тичных извлечений"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "игнорировать пакеты, р�дом � которыми лежит .keep файл"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "уровень �жати� пакета"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "не �крывать коммиты �ращени�ми"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "по возможно�ти и�пользовать индек� в битовых картах, дл� у�корени� под�чета объектов"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "запи�ь индек�а в битовых картах вме�те � индек�ом пакета"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "Под�чет объектов"
 
@@ -10573,11 +10726,11 @@ msgstr "паковать в�ё"
 msgid "prune loose refs (default)"
 msgstr "почи�тить �лабые ��ылки (по умолчанию)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "Удаление дублирующих�� объектов"
 
@@ -10616,9 +10769,9 @@ msgstr "Опции, �в�занные �о �ли�нием"
 
 #: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
-msgstr "забрать изменени� � помощью перебазировани�, а не �ли�ни�"
+msgstr "забрать изменени� � помощью перемещени�, а не �ли�ни�"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "разрешить перемотку вперед"
 
@@ -10639,24 +10792,24 @@ msgstr "количеÑ�тво подмодулей, которые будут пÐ
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправильное значение дл� pull.ff: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "�ет претендентов дл� перемещени� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "�ет претендентов дл� �ли�ни� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "Обычно �то означает, что вы передали �пецификацию ��ылки � помощью шаблона и �тот шаблон ни � чем не �овпал на внешнем репозитории."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -10664,69 +10817,69 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr "Вы попро�или получить изменени� �о внешнего репозитори� «%s», но не указали ветку. Так как �то не репозиторий по умолчанию дл�  вашей текущей ветки, вы должны указать ветку в командной �троке."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Вы �ейча� ни на одной из веток."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Пожалуй�та, укажите на какую ветку вы хотите переме�тить изменени�."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Пожалуй�та, укажите � какой веткой вы хотите �лить изменени�."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Дл� дополнительной информации, �мотрите git-pull(1)."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<внешний-репозиторий>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<ветка>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "У текущей ветки нет информации об от�леживании."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 "Е�ли вы хотите указать информацию о от�леживаемой ветке, выполните:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr "Ваша конфигураци� указывает, что нужно �лить изменени� �о ��ылкой\n«%s» из внешнего репозитори�, но така� ��ылка не была получена."
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "игнорирование --verify-signatures при перемещении"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash можно и�пользовать только вме�те � --rebase."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обновление еще не начавшей�� ветки � изменени�ми, добавленными в индек�."
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "получение � перемещением"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "�делайте коммит или �пр�чьте их."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -10734,7 +10887,7 @@ msgid ""
 "commit %s."
 msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\n� коммита %s."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -10745,15 +10898,15 @@ msgid ""
 "to recover."
 msgstr "�е удало�ь перемотать вперёд изменени� в вашем рабочем каталоге.\nПо�ле того, как вы убедите�ь, что вы �охранили в�ё необходимое из вывода\n$ git diff %s\n, запу�тите\n$ git reset --hard\nдл� во��тановлени� и�ходного �о�то�ни�."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�ельз� �лить не�колько веток в пу�той указатель на ветку."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "�евозможно переме�тить над не�колькими ветками."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "невозможно выполнить перемещение � запи�анными локальными изменени�ми в подмодул�х"
 
@@ -11074,19 +11227,47 @@ msgstr "отладка unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<опции>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "о�тавить пу�тые коммиты"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "продолжить перемещение"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "о�тановить перемещение"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "�оздать �ценарий перемещени�"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "�ократить контрольные �уммы SHA-1 в �пи�ке дел"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "ра�ширить контрольные �уммы SHA-1 в �пи�ке дел"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "проверить �пи�ок дел"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "пропу�тить ненужные команды pick"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "пере�тавить �троки fixup/squash"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <каталог-git>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11103,7 +11284,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr "По умолчанию, обновл�ть текущую ветку в репозитории � рабочей\nкопией (не голом) запрещено, так как �то �делает �о�то�ние индек�а\nи рабочего каталога противоречивым, и вам прийдет�� выполнить\n«git reset --hard», чтобы �о�то�ние рабочего каталога �нова\n�оответ�твовало HEAD.\n\nВы можете у�тановить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но �то не рекомендует��, е�ли только\nвы не намерены обновить его рабочий каталог �по�обом подобным\nвышеопи�анному.\n\nЧтобы пропу�тить �то �ообщение и в�е равно о�тавить поведение\nпо умолчанию, у�тановите значение опции «receive.denyCurrentBranch»\nв «refuse»."
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -11115,11 +11296,11 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr "По умолчанию, удаление текущей ветки запрещено, так как по�ледующий\n«git clone» не �может получить никаких файлов, что приведет к путанице.\n\nВы можете у�тановить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории,  чтобы разрешить\nудаление текущей ветки � или без предупреждающего �ообщени�.\n\nЧтобы пропу�тить �то �ообщение, вы можете у�тановить значение опции\nв «refuse»."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "тихий режим"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Вы должны указать каталог."
 
@@ -11264,12 +11445,12 @@ msgstr "указание ма�тер ветки не имеет �мы�ла �
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "указание от�леживаемых веток имеет �мы�л только при зеркальном извлечении"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "внешний репозиторий %s уже �уще�твует"
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "«%s» не �вл�ет�� допу�тимым именем внешнего репозитори�."
@@ -11292,17 +11473,17 @@ msgstr "(�оответ�твующа�)"
 msgid "(delete)"
 msgstr "(удаленна�)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "�ет такого внешнего репозитори�: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�е удало�ь переименовать �екцию конфигурации � «%s» на «%s»"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11310,17 +11491,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr "�е обновл�ю не�тандартную �пецификатор ��ылки дл� извлечени�\n\t%s\n\tПожалуй�та, е�ли требует��, обновите конфигурацию вручную."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "не удало�ь удалить «%s»"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "не удало�ь �оздать «%s»"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11332,143 +11513,143 @@ msgstr[1] "Примечание: �екоторые ветки вне иерар
 msgstr[2] "Примечание: �екоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, и�пользуйте:"
 msgstr[3] "Примечание: �екоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, и�пользуйте:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�е удало�ь удалить �екцию файла конфигурации «%s»"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нова� (�ледующее извлечение �охранит ее в remotes/%s)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " от�леживает��"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " недей�твительна (и�пользуйте «git remote prune», чтобы удалить)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переме�тить более чем над 1 веткой"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "перемещает�� интерактивно над внешней веткой %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "перемещает�� над внешней веткой %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " будет �лита � внешней веткой %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "будет �лита � внешней веткой %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и � внешней веткой %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "�оздана"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "удалена"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "уже актуальна"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "возможна перемотка вперед"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "локальна� ветка у�тарела"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s будет принудительно отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s будет отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s будет принудительно отправлена в %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s будет отправлена в %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "не опрашивать внешние репозитории"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* внешний репозиторий %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL дл� извлечени�: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(нет URL)"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "    URL дл� отправки: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ветка: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(не запрашивал��)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(неизве�тно)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD ветка (HEAD внешнего репозитори� неоднозначный, может быть одним из):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -11477,11 +11658,11 @@ msgstr[1] "  Внешние ветки:%s"
 msgstr[2] "  Внешние ветки:%s"
 msgstr[3] "  Внешние ветки:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (�тату� не запрашивал��)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локальна� ветка, на�троенна� дл� «git pull»:"
@@ -11489,11 +11670,11 @@ msgstr[1] "  Локальные ветки, на�троенные дл� «git
 msgstr[2] "  Локальные ветки, на�троенные дл� «git pull»:"
 msgstr[3] "  Локальные ветки, на�троенные дл� «git pull»:"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr " Локальные ��ылки, зеркалируемые � помощью «git push»"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -11502,132 +11683,132 @@ msgstr[1] "  Локальные ��ылки, на�троенные дл� «gi
 msgstr[2] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 msgstr[3] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "у�тановить refs/remotes/<им�>/HEAD в зави�имо�ти от внешнего репозитори�"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "удалить refs/remotes/<им�>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "�е удало�ь определить внешний HEAD"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "�е�колько внешних HEAD веток. Укажите �вно одну из них:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "�е удало�ь удалить %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�едопу�тима� ��ылка: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "�е удало�ь на�троить %s"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s будет ви��щей веткой!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s �тала ви��щей веткой!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "Очи�тка %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [будет удалена] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [удалена] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "почи�тить внешние репозитории по�ле извлечени�"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "�ет такого внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "добавить ветку"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "не указан внешний репозиторий"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "запро�ить URL отправки, вме�то URL извлечени�"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "вернуть в�е URL"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "URL не на�троены дл� внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "управление URL отправки"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "добавить URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "удалить URL"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add нельз� и�пользовать одновременно � --delete"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправильный шаблон �тарого URL: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "�е найдены �овпадени� URL: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "�ельз� удалить в�е URL не-отправки"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "быть много�ловнее; должно �то�ть перед подкомандой"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "�еизве�тна� подкоманда: %s"
@@ -11722,7 +11903,7 @@ msgstr "нельзÑ� удалÑ�Ñ‚ÑŒ пакеты в precious-objects репозÐ
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable и -A нельз� и�пользовать одновременно"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "�бой удалени� «%s»"
@@ -11852,119 +12033,119 @@ msgstr "�ли�нием"
 msgid "keep"
 msgstr "о�тавлением"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "У ва� нет верного HEAD."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "�е удало�ь найти дерево у HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "�е удало�ь найти дерево у %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD �ейча� на %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�ельз� выполнить �бро� в режиме «%s» во врем� �ли�ни�."
 
-#: builtin/reset.c:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "тихий режим, выводить только ошибки"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "�бро�ить HEAD и индек�"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "�бро�ить только HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "�бро�ить HEAD, индек� и рабочий каталог"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "�бро�ить HEAD, но о�тавить локальные изменени�"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr "запи�ать только факт того, что удаленные пути будут добавлены позже"
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "�е удало�ь ра�познать «%s» как дей�твительную редакцию."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "�е удало�ь ра�познать «%s» как дей�твительное дерево."
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch нельз� и�пользовать одновременно � --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "и�пользование опции --mixed � пут�ми у�тарело; и�пользуйте «git reset -- <пути>» instead."
 
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�ельз� выполнить �бро� в режиме «%s» вме�те � указанием пути."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�бро� «%s» разрешен только � голым репозиторием"
 
-#: builtin/reset.c:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N можно и�пользовать вме�те � --mixed"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "�епроиндек�ированные изменени� по�ле �бро�а:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�е удало�ь �бро�ить файл индек�а на редакцию «%s»."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "�е удало�ь запи�ать новый файл индек�а."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list не поддерживает отображение заметок"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "передавать далее «--» как аргумент"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "о�тановить разбор по�ле первого аргумента не �вл�ющего�� опцией"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "выводить аргументы в длинном формате"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12050,11 +12231,11 @@ msgstr "разрешить коммиты � пу�тыми �ообщени�м
 msgid "keep redundant, empty commits"
 msgstr "о�тавить избыточные, пу�тые коммиты"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "�бой обращени� изменений коммита"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "�бой при копировании коммита"
 
@@ -12122,17 +12303,17 @@ msgstr "разрешить рекур�ивное удаление"
 msgid "exit with a zero status even if nothing matched"
 msgstr "выход � нулевым кодом возврата, даже е�ли ничего не найдено"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "не удал�ю рекур�ивно «%s» без указани� опции -r"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: не удало�ь удалить %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "не удало�ь удалить «%s»"
@@ -12163,27 +12344,27 @@ msgstr "вывеÑ�ти Ñ�татуÑ� от Ñ�крипта внешнего Ñ�ерÐ
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "Группировать по коммитеру, а не по автору"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "от�ортировать вывод по количе�тву коммитов у автора"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "�е выводить опи�ани� коммитов, а только их количе�тво"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Показать почту каждого из авторов"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Перено� �трок на выводе"
 
@@ -12382,215 +12563,215 @@ msgstr "пропу�тить и удалить в�е �троки, начина
 msgid "prepend comment character and space to each line"
 msgstr "добавить перед каждой �трокой �имвол комметари� и пробел"
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "�ет такой ��ылки: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Ожидало�ь полное им� ��ылки, а получено %s"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не удало�ь обрезать один компонент url «%s»"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "альтернативный �имвол дл� отно�ительных путей"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "URL дл� подмодул� по пути «%s» не найден в .gitmodules"
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "не удало�ь запро�ить конфигурацию «%s». Предполагаю, что �тот репозиторий имеет �вой �об�твенный выше�то�щий репозиторий."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Сбой реги�трации адре�а дл� пути подмодул� «%s»"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Подмодуль «%s» (%s) зареги�трирован по пути «%s»\n"
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "внимание: предполагаемый режим обновлени� дл� подмодул� «%s»\n"
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Сбой реги�трации режима обновлени� дл� пути подмодул� «%s»"
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "�е выводить информацию о инициализации подмодул�"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<путь>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <путь>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "не найдено �оответ�твие подмодулей в .gitmodules дл� пути «%s»"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "подмодулю «%s» не удало�ь добавить альтернативу: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Значение «%s» дл� параметра submodule.alternateErrorStrategy не рапознано"
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Значение «%s» дл� параметра submodule.alternateLocation не рапознано"
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "куда должен быть �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "им� нового подмодул�"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "url откуда должен был �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "глубина дл� ча�тичного клона"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "принудительно выводить прогре�� клонировани�"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <им�>] [--depth <глубина>] --url <url> --path <путь>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "не удало�ь клонировать «%s» в подмодуль по пути «%s»"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "не удало�ь получить каталог дл� подмодул� «%s»"
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Подмодуль по пути «%s» не инициализирован"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Возможно, вы хотели и�пользовать «update --init»?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пропу�к не �литого подмодул� %s"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пропу�к подмодул� «%s»"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�е удало�ь клонировать «%s». Запланирована повторна� попытка"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "�е удало�ь клонировать «%s» �о второй попытки, отмена"
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "путь в рабочем каталоге"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "путь в рабочем каталоге, в пределах границ подмодул�"
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout или none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Создать ча�тичный клон, ограниченный указанным количе�твом редакций"
 
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "параллельные задачи"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "должен ли изначальный проце�� клонировани� �ледовать рекомендации о ча�тично�ти"
 
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "вы выводить прогре�� клонировани�"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "плохое значение дл� параметра update"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, 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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "рекур�ивно по подмодул�м"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<путь>…]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s не поддерживает параметр --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» не �вл�ет�� подкомандой submodule--helper"
@@ -12603,23 +12784,23 @@ msgstr "git symbolic-ref [<опции>] <им�> [<��ылка>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <им�>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "не выводить �ообщени� об ошибках дл� не�имвольных (от�оединенных) ��ылок"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "удалить �имвольные ��ылки"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "укороченный вывод ��ылок"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "причина обновлени�"
 
@@ -12643,17 +12824,17 @@ msgstr "git tag -l [-n[<количе�тво>]] [--contains <коммит>] [--n
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<формат>] <им�-метки>…"
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "метка  «%s» не найдена."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Метка «%s» удалена (была %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -12662,7 +12843,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr "\nВведите �ообщение дл� метки:\n  %s\nСтроки, начинающие�� � «%c» будут проигнорированы.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -12671,142 +12852,142 @@ msgid ""
 "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr "\nВведите �ообщение дл� метки:\n  %s\nСтроки, начинающие�� � «%c» будут о�тавлены; вы можете удалить их вручную, е�ли хотите.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "не удало�ь подпи�ать метку"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "не удало�ь запи�ать файл метки"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "неправильный тип объекта"
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "нет опи�ани� метки?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Сообщение метки было о�тавлено в %s\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "�пи�ок названий меток"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "печатать <n> �трок опи�ани� от каждой метки"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "удалить метки"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "проверить метки"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "�а�тройки �оздани� метки"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "дл� аннотированной метки нужно �ообщение"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "опи�ание метки"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "аннотированна� и подпи�анна� � помощью GPG метка"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "и�пользовать другой ключ дл� подпи�ани� метки"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "замена метки, е�ли она �уще�твует"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "�оздать журнал ��ылок"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "�а�тройки вывода �пи�ка меток"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "показать �пи�ок меток по �толбцам"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "вывод только меток, которые �одержат коммит"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "вывод только меток, которые не �одержат коммит"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "вывод только �литых меток"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "вывод только не �литых меток"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "вывод только меток, определенного объекта"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column и -n нельз� и�пользовать одновременно"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "опцию -n можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "опцию --contains можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "опцию --no-contains можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "опцию --points-at можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "опции --merged и --no-merged можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "-F и -m нельз� и�пользовать одновременно."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "передано �лишком много параметров"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» не �вл�ет�� допу�тимым именем метки."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "метка «%s» уже �уще�твует"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Метка «%s» обновлена (была %s)\n"
@@ -12873,155 +13054,155 @@ msgstr "информаци� �тати�тики каталога не изме
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<опции>] [--] [<файл>…]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "продолжить обновление, даже е�ли индек� требует обновлени�"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "обновление: игнорировать подмодули"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "не игнорировать новые файлы"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "разрешить файлам замен�ть каталоги и наоборот"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "замечать файлы от�ут�твующие в рабочем каталоге"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "обновить, даже е�ли в индек�е имеют�� не �литые запи�и"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "обновить информацию о �тату�е файлов"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "как --refresh, но игнорировать на�тройку assume-unchanged"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<режим до�тупа>,<объект>,<путь>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "добавить указанную запи�ь в индек�"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "пометить файлы как «не измененные»"
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "убрать пометку assumed-unchanged"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "пометить файлы как «только в индек�е»"
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "убрать пометку skip-worktree"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr "только добавить в индек�; не добавл�ть �одержимое в базу данных объектов"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr "удалить указанные пути, даже е�ли они �уще�твуют в рабочем каталоге"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "� опцией --stdin: �троки на вводе отдел�ют�� �УЛЕВЫМ байтом"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "прочитать �пи�ок обновл�емых путей из �тандартного ввода"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "добавить запи�и из �тандартного ввода в индек�"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "заново заполнить индек� #2 и #3 дл� указанных путей"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "обновить только запи�и, которые отличают�� от HEAD"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "игнорировать файлы, от�ут�твующие в рабочем каталоге"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "выве�ти выполн�емые дей�тви� на �тандартный вывод"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(дл� машинной обработки) забыть �охраненные неразрешенные конфликты"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "запи�ать индек� в указанном формате"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "разрешить или запретить раздельный индек�"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "включить/отключить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверить, что файлова� �и�тема поддерживает к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "включить к�ш неот�леживаемых файлов без проверки файловой �и�темы"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr "параметр  core.splitIndex у�тановлен в false; удалите или измените его, е�ли вы дей�твительно хотите включить разделенный индек�"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr "параметр  core.splitIndex у�тановлен в true; удалите или измените его, е�ли вы дей�твительно хотите отключить разделенный индек�"
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr "параметр core.untrackedCache у�тановлен true; удалите или измените его, е�ли вы дей�твительно хотите удалить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "К�ш неот�леживаемых файлов отключен"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want"
 " to enable the untracked cache"
 msgstr "параметр core.untrackedCache у�тановлен false; удалите или измените его, е�ли вы дей�твительно хотите включить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "К�ш неот�леживаемых файлов включен дл� «%s»"
@@ -13038,19 +13219,19 @@ msgstr "git update-ref [<опции>]    <имÑ�-Ñ�Ñ�ылки> <новое-знÐ
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<опции>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "удалить ��ылку"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "обновить <им�-��ылки> а не то, на что она указывает"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "ввод отделённый �УЛЕВЫМИ �имволами"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "прочитать обновлени� из �тандартного ввода"
 
@@ -13114,102 +13295,109 @@ msgstr "git worktree prune [<опции>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <путь>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Удаление рабочих каталогов/%s: не �вл�ет�� каталогом"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Удаление рабочих каталогов/%s: файл gitdir не �уще�твует"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Удаление рабочих каталогов/%s: не удало�ь прочитать файл gitdir (%s)"
 
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидало�ь %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Удаление рабочих каталогов/%s: недей�твительный файл gitdir"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Удаление рабочих каталогов/%s: gitdir указывает на не�уще�твующее ра�положение"
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "выве�ти �пи�ок удаленных рабочих каталогов"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "удалить рабочие каталоги �тарее чем <дата-окончани�>"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» уже �уще�твует"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготовка %s (идентификатор %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "переключить�� на <ветка> даже е�ли она уже активна в другом рабоче�м каталоге"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "�оздать новую ветку"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "�оздать или перейти на ветку"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "наполнить новый рабочий каталог"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "держать рабочий каталог заблокированным"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B и --detach нельз� и�пользовать одновременно"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "причина блокировки"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» не �вл�ет�� рабочим каталогом"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» уже заблокирован, причина: %s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» уже заблокирован"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» не заблокирован"
@@ -13234,23 +13422,23 @@ msgstr "и�пользует�� только при отладке"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<опции>] <каталог>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "выход по�ле обмена одним запро�ом/ответом"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "выходить �разу по�ле начального объ�влени� �пи�ка ��ылок"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "не провер�ть <каталог>/.git/ е�ли <каталог> не �вл�ет�� каталогом Git"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "прервать передачу по�ле <кол> �екунд про�то�"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13259,7 +13447,7 @@ msgid ""
 "\tchmod 0700 %s"
 msgstr "Права до�тупа к вашему каталогу �окетов �лишком �вободны; друге пользователи могуи читать ваши зак�шированные пароли до�тупа. Обдумайте запу�к команды:\n\n\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "вывод отладочных �ообщений на stderr"
 
@@ -13270,20 +13458,20 @@ msgid ""
 "to read about a specific subcommand or concept."
 msgstr "«git help -а» и «git help -g» выводит �пи�ок до�тупных подкоманд и\nнекоторые руковод�тва по темам. Запу�тите «git help <команда>» или\n«git help <термин>», чтобы проче�ть о конкретных подкоманде или теме."
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "отрицательное значение http.postbuffer; и�пользую �тандартное значение %d"
 
-#: http.c:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Делегаци� проверки полномочий не поддерживает�� � cURL < 7.22.0"
 
-#: http.c:367
+#: http.c:368
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Public key pinning не поддерживает�� � cURL < 7.44.0"
 
-#: http.c:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13627,7 +13815,7 @@ msgstr "�е удало�ь найти общий коммит � $pretty_name"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "Уже обновлено в �оответ�твии � $pretty_name"
 
 #: git-merge-octopus.sh:89
@@ -13646,52 +13834,53 @@ msgstr "Про�тое �ли�ние не удало�ь, попытка авт
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort\"."
-msgstr "Когда вы разрешите �тот конфликт, запу�тите «git rebase --continue».\nЕ�ли вы хотите пропу�тить �тот патч, то запу�тите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и о�тановить перемещение, запу�тите «git rebase --abort»."
+"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\"."
+msgstr "Разрешите в�е конфликты вручную, пометьте их разрешёнными � помощью «git add/rm <конфликтующие-файлы>», а затем запу�тите «git rebase --continue».\nЕ�ли вы хотите пропу�тить �тот коммит, то запу�тите «git rebase --skip».\nЧтобы вернуть�� на �о�то�ние до «git rebase», запу�тите «git rebase --abort»."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "�е удало�ь перейти назад на $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "Применены автоматиче�ки �пр�танные изменени�."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "�е удало�ь �охранить $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Перехватчик pre-rebase отказал в перемещении."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "Похоже, git-am выполн�ет��. Перемещение невозможно."
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "�ет перемещени� в проце��е?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Дей�твие --edit-todo может и�пользовать�� только при интерактивном перемещении."
 
-#: git-rebase.sh:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "�е удало�ь прочитать HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr "Вы должны отредактировать в�е\nконфликты �ли�ни�, а потом пометить\nих как разрешенные � помощью git add"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -13704,101 +13893,101 @@ msgid ""
 "valuable there."
 msgstr "Похоже, каталог $state_dir_base уже �уще�твует и � предполагаю, что вы в проце��е другого перемещени�.  Е�ли �то так, попробуйте\n\t$cmd_live_rebase\nЕ�ли нет\n\t$cmd_clear_stale_rebase\nи запу�тите мен� �нова.  Я о�танавливаю�ь, чтобы вы не потер�ли что-то важное."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "недей�твительна� выше�то�ща� ветка $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: имеет�� больше одной базы �ли�ни�"
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: нет базы �ли�ни�"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "�е указывает на дей�твительный коммит: $onto_name"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "критиче�ка� ошибка: нет такой ветки: $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "�е удало�ь автоматиче�ки �пр�тать изменени�"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Изменени� автоматиче�ки �пр�таны: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Сделайте коммит или �пр�чьте их."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Текуща� ветка $branch_name уже �вежа�."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Текуща� ветка $branch_name уже �вежа�, принудительное перемещение."
 
-#: git-rebase.sh:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Изменени� от $mb до $onto:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменени� поверх него…"
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Перемотана вперед $branch_name до $onto_name."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash очи�тка � параметрами не реализована"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "У ва� еще нет начального коммита"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "�е удало�ь �охранить текущее �о�то�ние индек�а"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "�евозможно �охранить неот�леживаемые файлы"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "�е удало�ь �охранить текущее �о�то�ние рабочего каталога"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "Изменени� не выбраны"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "�е удало�ь удалить временный индек� (не должно �лучать��)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "�е удало�ь запи�ать �о�то�ние рабочего каталога"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "�е удало�ь обновить $ref_stash � помощью $w_commit"
@@ -13812,114 +14001,114 @@ msgstr "�е удало�ь обновить $ref_stash � помощью $w_com
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
 "       To provide a message, use git stash save -- '$option'"
 msgstr "ошибка: неизве�тна� опци� дл� «stash save»: $option\n        Дл� предо�тавлени� �ообщени�, и�пользуйте git stash save -- «$option»"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�ельз� и�пользовать --patch и --include-untracked или --all одновременно"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "�ет локальных изменений дл� �охранени�"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "�е удало�ь инициализировать �пр�танные изменени�"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "�е удало�ь �охранить текущий �тату�"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Рабочий каталог и �о�то�ние индек�а �охранены $stash_msg"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "�е удало�ь удалить изменени� рабочего каталога"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "неизве�тна� опци�: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "�е найдены �пр�танные изменени�."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Передано �лишком много редакций: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference не �вл�ет�� дей�твительной ��ылкой"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "«$args» не похоже на коммит �о �пр�танными изменени�ми"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "«$args» не �вл�ет�� ��ылкой на �пр�танные изменени�"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "не удало�ь обновить индек�"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "�ельз� применить �пр�танные изменени� во врем� выполнени� �ли�ни�"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "Конфликты в индек�е. Попробуйте без --index."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "�е удало�ь �охранить дерево индек�а"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr "�евозможно во��тановить неот�леживаемые файлы из �пр�танных изменений"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "�евозможно убрать из индек�а измененные файлы"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "Индек� не был извлечён из �пр�танных изменений."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
 msgstr "Спр�танные изменени� �охранены, на �лучай е�ли они �нова вам понадоб�т��."
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Отброшено ${REV} ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: �е удало�ь отбро�ить запи�ь из �пр�танных изменений"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "�е указано им� ветки"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Чтобы во��тановить их, наберите «git stash apply»)"
 
@@ -14048,110 +14237,110 @@ msgstr "Ð�е удалоÑ�ÑŒ Ñ�оздать пуÑ�той каталог подмÐ
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Подмодуль «$name» ($url) был �н�т � реги�трации по пути «$displaypath»"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "�е удало�ь найти текущую редакцию дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�е удало�ь выполнить извлечение дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "�е удало�ь найти текущую редакцию ${remote_name}/${branch} дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить извлечение дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr "Получен по пути подмодул� «$displaypath», но не �одержит $sha1. Сбой при пр�мом получении коммита."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь переключить�� на �о�то�ние «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: забрано �о�то�ние «$sha1»"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь переме�тить «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить �ли�ние � «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: �лито � «$sha1»"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "Сбой выполнени� «$command $sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить рекур�ивно дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опцию --cached нельз� и�пользовать одновременно � опцией --files"
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неизве�тный режим $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_src"
 
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_dst"
 
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "�е удало�ь выполнить рекур�ивно дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Синхронизаци� url дл� подмодул� «$displaypath»"
@@ -14170,16 +14359,16 @@ msgstr "Перемещение ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr "\nКоманды:\n p, pick = и�пользовать коммит\n r, reword = и�пользовать коммит, но изменить �ообщение коммита\n e, edit = и�пользовать коммит, но о�тановить�� дл� вне�ени� правок\n s, squash = и�пользовать коммит, но объединить его � предыдущим коммитом\n f, fixup = как «squash», но отбро�ить �ообщение �того коммита\n x, exec = выполнить команду (о�таток �троки) � помощью командной оболочки\n d, drop = удалить коммит\n\nЭти �троки могут быть перемещены; выполн�ют�� по очереди �верху вниз.\n"
+msgstr "\nКоманды:\np, pick = и�пользовать коммит\nr, reword = и�пользовать коммит, но изменить �ообщение коммита\ne, edit = и�пользовать коммит, но о�тановить�� дл� вне�ени� правок\ns, squash = и�пользовать коммит, но объединить его � предыдущим коммитом\nf, fixup = как «squash», но отбро�ить �ообщение �того коммита\nx, exec = выполнить команду (о�таток �троки) � помощью командной оболочки\nd, drop = удалить коммит\n\nЭти �троки могут быть перемещены; выполн�ют�� по очереди �верху вниз.\n"
 
 #: git-rebase--interactive.sh:171
 msgid ""
@@ -14239,27 +14428,27 @@ msgstr "�е удало�ь переме�тить HEAD на $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "�ельз� уплотнить �ли�ние: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Ошибка при повторении �ли�ни� $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "�е удало�ь вз�ть $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Это �ообщение коммита номер #${n}:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Сообщение коммита номер #${n} будет пропущено:"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
@@ -14268,22 +14457,22 @@ msgstr[1] "Это объединение $count коммитов"
 msgstr[2] "Это объединение $count коммитов"
 msgstr[3] "Это объединение $count коммитов"
 
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�е удало�ь запи�ать $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Это объединение 2 коммитов"
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "�е удало�ь применить $sha1… $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14292,31 +14481,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr "�е удоло�ь и�править коммит по�ле у�пешного перехода на $sha1… $rest\nЭто произошло, �корее в�его, из-за пу�того �ообщени� коммита или из-за перехватчика перед коммитом. Е�ли же �то произошло из-за перехватчика перед коммитом, то вам нужно решить � ним проблему и повторить попытку �нова."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "О�тановлено на $sha1_abbrev… $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "�ельз� �делать «$squash_style» без указани� предыдущего коммита"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Выполнение: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "�е удало�ь выполнить: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 msgid "and made changes to the index and/or the working tree"
 msgstr "и были �деланы изменени� в индек�е и/или в рабочем каталоге"
 
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -14324,7 +14513,7 @@ msgid ""
 msgstr "Вы можете и�править ошибку, а затем запу�тить\n\n\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -14334,78 +14523,29 @@ msgid ""
 "\tgit rebase --continue"
 msgstr "У�пешное выполнение: $rest\nно о�тали�ь изменени� в индек�е и/или в рабочем каталоге\nСделайте коммит или �пр�чьте ваши изменени�, а затем выполните\n\n\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "�еопознанна� команда: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Пожалуй�та и�правьте �то � помощью «git rebase --edit-todo»."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
-msgstr "У�пешно перебазирован и обновлён $head_name."
+msgstr "У�пешно перемещён и обновлён $head_name."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "�е удало�ь пропу�тить ненужные команды отбора (pick)"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr "Внимание: не найден SHA-1 или он не указывает на коммит. �а �троке:\n - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr "Внимание: команда не ра�познана на �троке:\n - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "не удало�ь отделить HEAD"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к �тарым):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr "Дл� избежани� �того �ообщени�, и�пользуйте «drop» чтобы �вно удалить коммит.\n\nИ�пользуйте опцию «git config rebase.missingCommitsCheck» дл� изменени� количе�тва предупреждений.\nВозможные значени�: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr "�ера�познанна� на�тройка $check_level дл� опции rebase.missingCommitsCheck. Игнорирую."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase "
-"--continue'."
-msgstr "Вы можете и�править �то � помощью «git rebase --edit-todo», а потом запу�тив «git rebase --continue»."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Или вы можете отменить проце�� перебазировани� � помощью «git rebase --abort»."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "�е удало�ь удалить CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -14423,21 +14563,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr "У ва� имеют�� проиндек�ированные изменени� в рабочем каталоге.\nЕ�ли �ти изменени� должны быть объеденены � предыдущим коммитом, то запу�тите:\n\n  git commit --amend $gpg_sign_opt_quoted\n\nЕ�ли же они должны быть помещены в новый коммит, то запу�тите:\n\n  git commit $gpg_sign_opt_quoted\n\nВ любом �лучае, по�ле того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 msgid "Error trying to find the author identity to amend commit"
 msgstr "Произошла ошибка при пои�ке автора дл� и�правлени� коммита"
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "�е удало�ь закоммитить проиндек�ированные изменени�."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14446,33 +14586,33 @@ msgid ""
 "\n"
 msgstr "\nВы �ейча� редактируете файл �о �пи�ком дел дл� интерактивного перемещени�.\nДл� продолжени� перемещени�, по�ле редактировани� файла запу�тите:\n    git rebase --continue\n\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "�е удало�ь запу�тить редактор"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "�е удало�ь перейти на вер�ию $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "�ет указател� HEAD?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "�е удало�ь �оздать временный каталог $state_dir"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "�е удало�ь пометить как интерактивный"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "�е удало�ь инициализировать перезапи�анные коммиты"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -14481,14 +14621,14 @@ msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount
 msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
 msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
 
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr "\n�о е�ли вы удалите в�е, то проце�� перемещени� будет будет прерван.\n\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Заметьте, что пу�тые коммиты закомментированны"
 
@@ -15007,59 +15147,59 @@ msgstr "локальный ча�овой по�� отличает�� от GMT
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "локальный �двиг времени больше или равен 24 ча�а\n"
 
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "редактор был завершен � ошибкой, отмен�ю в�ё"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 msgid "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» �одержит промежуточную вер�ию пи�ьма, которое вы готовите.\n"
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» �одержит подготовленное пи�ьмо.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases не �овме�тимо � другими опци�ми\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�ельз� запу�кать git format-patch вне репозитори�\n"
 
-#: git-send-email.perl:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�еизве�тное поле --suppress-cc: «%s»\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�еизве�тный параметр --confirm: «%s»\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "предупреждение: �окращение дл� sendmail � кавычками не поддерживает��: %s\n"
 
-#: git-send-email.perl:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "предупреждение: «:include:» не поддерживает��: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживает��: %s\n"
 
-#: git-send-email.perl:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "предупреждение: �трока sendmail не ра�познана: %s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15069,36 +15209,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr "Файл «%s» �уще�твует, но �то также может быть и\nдиапазоном коммитов дл� которых нужно �делать патчи. \nУ�траните неоднозначно�ть…\n\n    * Указав \"./%s\" е�ли вы имеете в виду им� файла; или\n    * Передав опцию --format-patch е�ли вы имеете в виду диапазон коммитов.\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "�е удало�ь выполнить opendir %s: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr "критиче�ка� ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr "\nФайл � патчем не указан!\n\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "�ет �троки � темой в %s?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "�е удало�ь открыть дл� запи�и %s: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15107,41 +15247,41 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr "Строки, начинающие�� � «GIT:» будут удалены.\nВозможно будет полезно включить �тати�тику добавлений\nи удалений или таблицу �одержимого в патч, который вы пишете.\n\nОчи�тите �одержимое, е�ли вы не хотите отправл�ть пи�ьмо � краткой информацией.\n"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "�е удало�ь открыть %s.final: %s"
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "�е удало�ь открыть %s: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 msgid "Summary email is empty, skipping it\n"
 msgstr "Пи�ьмо � краткой информацией пу�тое, попу�каю его\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Вы уверены, что хотите и�пользовать <%s> [y/N]? "
 
-#: git-send-email.perl:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "Следующие файлы 8 битные, но не �одержат Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15149,20 +15289,20 @@ msgid ""
 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
 msgstr "Отказываю�ь отправить, т.к. патч\n\t%s\n�одержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, е�ли вы  дей�твительно хотите отправить его.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Кому должны быть отправлены пи�ьма (е�ли нужно)?"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "критиче�ка� ошибка: �окращение «%s» ра�крывает�� �амо в �еб�\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ошибка: не удало�ь выделить дей�твительный адре� из: %s\n"
@@ -15170,16 +15310,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Что нужно �делать � �тим адре�ом? ([q] - выход|[d] - отбро�ить|[e] - редактировать): "
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "путь CA «%s» не �уще�твует"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15196,128 +15336,128 @@ msgstr "    СпиÑ�ок Cc (получателей копии пиÑ�ьма) бÑ
 #. 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:1335
+#: git-send-email.perl:1350
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Отправить �то пи�ьмо? ([y] - да|[n] - нет|[q] - выход|[a] - в�е): "
 
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Отправка �того ответа на пи�ьмо об�зательна"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "Требуемый SMTP �ервер не был правильно объ�влен."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сервер не поддерживает STARTTLS! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Ошибка STARTTLS! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "�е удало�ь инициализировать SMTP. Проверьте ваши на�тройки и попробуйте запу�тить в параметром --smtp-debug."
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "�е удало�ь отправить %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Имитаци� отправки %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Отправлено %s\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Имитаци� OK. Журнал �одержит:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK. Журнал �одержит:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Результат: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Результат: OK\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "не удало�ь открыть файл %s"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добавление to: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е удало�ь выполнить «%s»"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добавление %s: %s из: «%s»\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) не удало�ь закрыть поток к «%s»"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "не удало�ь отправить �ообщение в 7 битной кодировке"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "недопу�тима� кодировка передачи"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "не удало�ь открыть %s: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: патч �одержит �троку длиннее чем 998 �имволов"
 
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Вы дей�твительно хотите отправить %s? [y - да|N - нет]: "
diff --git a/po/sv.po b/po/sv.po
index 48c576549..011df87ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.14.0\n"
+"Project-Id-Version: git 2.15.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-19 22:35+0200\n"
-"PO-Revision-Date: 2017-07-20 22:56+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-18 19:34+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\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 2.0.2\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: advice.c:58
 #, c-format
@@ -70,7 +70,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
@@ -121,82 +121,82 @@ msgstr "okänt alternativ för whitespace: \"%s\""
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "okänt alternativ för ignore-whitespace: \"%s\""
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject och --3way kan inte användas samtidigt."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached och --3way kan inte användas samtidigt."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way utanför arkiv"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index utanför arkiv"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached utanför arkiv"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec returnerade %d för indata: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "kan inte hitta filnamn i patchen på rad %d"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "ogiltigt läge på rad %d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "huvudet är inkonsekvent mellan rad %d och %d"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: förväntade rad: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "patch-fragment utan huvud på rad %d: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -212,82 +212,82 @@ msgstr[1] ""
 "sökvägskomponenter\n"
 "tas bort (rad %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "ny fil beror på gammalt innehåll"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "borttagen fil har fortfarande innehåll"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "trasig patch på rad %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nya filen %s beror på gammalt innehåll"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "borttagna filen %s har fortfarande innehåll"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binärpatch på rad %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binärpatchen på rad %d känns inte igen"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skräp på rad %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte öppna eller läsa %s"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning på rad: \"%c\""
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -296,25 +296,25 @@ msgstr ""
 "vid sökning efter:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binära patchdata för \"%s\""
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
 "\""
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -322,419 +322,420 @@ msgstr ""
 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
 "innehållet."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binärpatchen kan inte tillämpas på \"%s\""
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "misslyckades läsa %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sökvägen %s har ändrat namn/tagits bort"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "arkivet saknar objekt som behövs för att falla tillbaka på 3-"
 "vägssammanslagning."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Faller tillbaka på trevägssammanslagning...\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillämpade patchen på  \"%s\" rent.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ogiltig sökväg �%s�"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "kunde inte lägga till %s till temporärt index"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporärt index till %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lägga till cachepost för %s"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "misslyckades skriva till \"%s\""
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "indata känns inte igen"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte öppna patchen \"%s\": %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "undertryckte %d fel i blanksteg"
 msgstr[1] "undertryckte %d fel i blanksteg"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d rad lägger till fel i blanksteg."
 msgstr[1] "%d rader lägger till fel i blanksteg."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "sökväg"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "antal"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillämpas på aktuellt index"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: apply.c:4947
+#: apply.c:4973
 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:4975
 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:4977
 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:4979
 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:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: apply.c:4958
+#: apply.c:4984
 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:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "åtgärd"
 
-#: apply.c:4960
+#: apply.c:4986
 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:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "var pratsam"
 
-#: apply.c:4978
+#: apply.c:5004
 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:5007
 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:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "rot"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
@@ -757,108 +758,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lägg till prefix till varje sökväg i arkivet"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "fil"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "skriv arkivet till filen"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "läs .gitattributes i arbetskatalogen"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "rapportera arkiverade filer på standard fel"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "endast spara"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "komprimera snabbare"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "komprimera bättre"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "arkiv"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "hämta arkivet från fjärrarkivet <arkiv>"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "kommando"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "sökväg till kommandot git-upload-archive på fjärren"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "Oväntad flagga --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "Oväntad flagga --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Okänt arkivformat \"%s\""
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%-*s är inte ett giltigt namn på attribut"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -936,31 +937,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas måste testas\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behövs"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var både %s och %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -969,7 +970,7 @@ msgstr ""
 "Ingen testbar incheckning hittades.\n"
 "Kanske du startade med felaktiga sökvägsparametrar?\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -979,7 +980,7 @@ msgstr[1] "(ungefär %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1000,10 +1001,10 @@ msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "misslyckades skapa revisionstraversering"
 
@@ -1044,45 +1045,50 @@ msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
-"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering."
+"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
+"ombasering."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"  genom "
+"ombasering."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Grenen %s ställdes in att spåra den lokala grenen %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Grenen %s ställdes in att spåra fjärreferensen %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
-"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."
+"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
+"ombasering."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1103,21 +1109,21 @@ msgstr "\"%s\" är inte ett giltigt grennamn."
 msgid "A branch named '%s' already exists."
 msgstr "Det finns redan en gren som heter �%s�."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "Kan inte tvinga uppdatering av aktuell gren."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1137,22 +1143,22 @@ msgstr ""
 "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
 "för att ställa in uppströmskonfigurationen när du sänder in."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Objektnamnet är inte giltigt: \"%s\"."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Objektnamnet är tvetydigt: \"%s\"."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Avgreningspunkten är inte giltig: �%s�."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "\"%s\" är redan utcheckad på \"%s\""
@@ -1172,7 +1178,9 @@ 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:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "kunde inte öppna \"%s\""
@@ -1181,56 +1189,56 @@ msgstr "kunde inte öppna \"%s\""
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: bundle.c:186
+#: bundle.c:193
 #, 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:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Paketet (bundlen) beskriver en komplett historik."
 
-#: bundle.c:195
+#: bundle.c:202
 #, 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:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "Kunde inte starta pack-objects"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "pack-objects misslyckades"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "rev-list dog"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okänt argument: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Vägrar skapa ett tomt paket (bundle)."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "index-pack dog"
 
@@ -1239,8 +1247,8 @@ msgstr "index-pack dog"
 msgid "invalid color value: %.*s"
 msgstr "felaktigt färgvärde: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "kunde inte tolka %s"
@@ -1250,7 +1258,7 @@ msgstr "kunde inte tolka %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s är inte en incheckning!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1264,160 +1272,160 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "felaktig konfigurationsfil rad %d i filen %s"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "felaktig konfigurationsfil rad %d i standard in"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "felaktig konfigurationsfil rad %d i %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "utanför intervallet"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "ogiltig enhet"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
 "en %s: %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
 "%s: %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "misslyckades expandera användarkatalog i: \"%s\""
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2085
+#: config.c:2130
 #, 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:2111
+#: config.c:2156
 #, 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:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
 
-#: config.c:2124
+#: config.c:2169
 #, 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:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades på %s"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte ställa in \"%s\" till \"%s\""
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "kunde inte ta bort inställning för \"%s\""
@@ -1440,19 +1448,19 @@ msgstr ""
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte köra \"git rev-list\""
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "kunde inte stänga rev-list:s standard in"
 
@@ -1488,19 +1496,69 @@ msgstr "LF skulle ersättas av CRLF i %s"
 msgid "in the future"
 msgstr "i framtiden"
 
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] "%"
-msgstr[1] "%"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekund sedan"
+msgstr[1] "%<PRIuMAX> sekunder sedan"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minut sedan"
+msgstr[1] "%<PRIuMAX> minuter sedan"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> timme sedan"
+msgstr[1] "%<PRIuMAX> timmar sedan"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dag sedan"
+msgstr[1] "%<PRIuMAX> dagar sedan"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> vecka sedan"
+msgstr[1] "%<PRIuMAX> veckor sedan"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> månad sedan"
+msgstr[1] "%<PRIuMAX> månader sedan"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> år"
+msgstr[1] "%<PRIuMAX> år"
 
 #. TRANSLATORS: "%s" is "<n> years"
 #: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] "%s. %"
-msgstr[1] "%s. %"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> månad sedan"
+msgstr[1] "%s, %<PRIuMAX> månader sedan"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> år sedan"
+msgstr[1] "%<PRIuMAX> år sedan"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1511,27 +1569,35 @@ msgstr "kunde inte läsa orderfilen \"%s\""
 msgid "Performing inexact rename detection"
 msgstr "Utför onöjaktig namnbytesdetektering"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "flaggan \"%s\" behöver ett värde"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
+"\"zebra\", \"dimmed_zebra\", \"plain\""
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1540,20 +1606,20 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1562,228 +1628,232 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:4716
+#: diff.c:5505
 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:4719
+#: diff.c:5508
 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:4722
+#: diff.c:5511
 #, 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:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "kunde inte skapa kataloger för %s"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtrerar innehåll"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: förväntade grund lista"
 
-#: fetch-pack.c:263
+#: 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:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "fjärrfel: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, 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:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc kräver �multi_ack_detailed�"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "förväntade shallow/unshallow, fick %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:533 progress.c:235
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-patch: kunde inte grena av %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Servern stöder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Servern stöder \"multi_ack_detailed\""
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Servern stöder \"no-done\""
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Servern stöder \"multi_ack\""
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Servern stöder \"side-band-64k\""
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Servern stöder \"side-band\""
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Servern stöder \"allow-tip-sha1-in-want\""
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Servern stöder \"ofs-delta\""
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen är %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Servern stöder inte --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stöder inte --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Servern stöder inte --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-patch: hämtning misslyckades."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "inget motsvarande fjärrhuvud"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sådan fjärreferens: %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, 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"
@@ -1796,7 +1866,7 @@ msgstr "gpg misslyckades signera data"
 msgid "could not create temporary file"
 msgstr "kunde inte skapa temporära fil"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "misslyckades skriva fristående signatur till \"%s\""
@@ -1806,17 +1876,17 @@ 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:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "misslyckades ta status på \"%s\""
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort läsning"
@@ -1959,12 +2029,12 @@ 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:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -1984,7 +2054,7 @@ msgstr ""
 "tidigare:\n"
 "ta bort filen manuellt för att fortsätta."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Kunde inte skapa \"%s.lock\": %s"
@@ -1993,78 +2063,78 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"
 msgid "failed to read the cache"
 msgstr "misslyckades läsa cachen"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "kunde inte skriva ny indexfil"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(felaktig incheckning)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "fel vid byggande av träd"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "misslyckades skapa sökvägen \"%s\"%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": kanske en K/F-konflikt?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "vägrar förlora ospårad fil vid \"%s\""
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kan inte läsa objektet %s: \"%s\""
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob förväntades för %s \"%s\""
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "misslyckades öppna \"%s\": %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, 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:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "Misslyckades exekvera intern sammanslagning"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Kunde inte lägga till %s till databasen"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2073,7 +2143,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:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2082,7 +2152,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:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2091,7 +2161,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:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2100,20 +2170,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:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "namnbyte"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "namnbytt"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, 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:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2122,139 +2192,139 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (lämnad olöst)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, 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:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Lägger till sammanslagen %s"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lägger till som %s istället"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "kan inte läsa objektet %s"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objektet %s är inte en blob"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "ändra"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "ändrad"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "innehåll"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "tillägg/tillägg"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Slår ihop %s automatiskt"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "undermodul"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "fil/katalog"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "katalog/fil"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Lägger till %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "Redan à jour!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av träden %s och %s misslyckades"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "Slår ihop:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, 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:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2266,7 +2336,7 @@ msgstr ""
 "att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
 "ny antecknings-sammanslagning."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
@@ -2294,16 +2364,30 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Felaktigt värde på %s: \"%s\""
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset före slutet av packfilen (trasig .idx?)"
+
+#: packfile.c:1683
+#, 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
+#, 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
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
@@ -2311,17 +2395,17 @@ msgstr "användning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-TAL"
 
@@ -2330,7 +2414,7 @@ msgstr "-TAL"
 msgid "malformed object name '%s'"
 msgstr "felformat objektnamn \"%s\""
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Kunde inte göra %s skrivbar för gruppen"
@@ -2404,7 +2488,7 @@ msgstr "\"%s\" (minnesstöd: \"%c\")"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
 
-#: pathspec.c:575
+#: 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"
@@ -2412,12 +2496,12 @@ msgstr ""
 "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
 "utgåva. använd istället . om du vill träffa alla sökvägar"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format för --pretty"
 
@@ -2439,50 +2523,51 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stänga \"%s\""
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status på \"%s\""
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte öppna git-katalog: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort länken: %s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Kunde inte öppna \"%s\" för skrivning"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "referensuppdateringar förbjudna i karantänmiljö"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "kunde inte ta bort referensen %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "kunde inte ta bort referensen %s: %s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "kunde inte ta bort referenser: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "kunde inte ta bort referensen %s"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "försvunnen"
@@ -2512,147 +2597,147 @@ msgstr "förväntat format: %%(color:<color>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "okänd färg: %%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "okänt %%(%s)-argument: %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) tar inte argument"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) tar inte argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "okänt %%(trailers)-argument: %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt värde förväntat contents:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "okänt %%(contents)-argument: %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "positivt värde förväntat objectname:short=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "okänt %%(objectname)-argument: %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "förväntat format: %%(align:<bredd>,<position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "okänd position:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "okänd bredd:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "okänt %%(align)-argument: %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "positiv bredd förväntad med atomen %%(align)"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "okänt %%(if)-argument: %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "felformat fältnamn: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "okänt fältnamn: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atomen %%(then) använd mer än en gång"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atomen %%(else) använd mer än en gång"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atomen %%(end) använd utan motsvarande atom"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "felformad formatsträng %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(ingen gren, ombaserar %s)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(ingen gren, \"bisect\" startad på %s)"
@@ -2660,7 +2745,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD frånkopplat vid %s)"
@@ -2668,108 +2753,108 @@ msgstr "(HEAD frånkopplat vid %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD frånkopplat från %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(ingen gren)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas för %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: remote.c:747
+#: remote.c:750
 #, 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:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spårar vanligtvis %s, inte %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spårar både %s och %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte på en gren"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okänd gren: \"%s\""
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppström angiven för grenen \"%s\""
 
-#: remote.c:1698
+#: remote.c:1699
 #, 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:1713
+#: remote.c:1714
 #, 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:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mål"
 
@@ -2784,7 +2869,7 @@ msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "Din gren är à jour med \"%s\".\n"
 
 #: remote.c:2087
@@ -2831,16 +2916,16 @@ msgstr[1] ""
 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:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2190
+#: revision.c:2259
 #, 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:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent är inkompatibelt med --bisect"
 
@@ -2882,24 +2967,24 @@ msgstr "mottagarsidan stöder inte push med --atomic"
 msgid "the receiving end does not support push options"
 msgstr "mottagarsidan stöder inte push-flaggor"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Okänd funktion: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2907,7 +2992,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:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2917,42 +3002,43 @@ msgstr ""
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
 "och checka in resultatet med \"git commit\""
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte låsa \"%s\""
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "kunde inte skriva till \"%s\""
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "misslyckades färdigställa \"%s\"."
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "dina lokala ändringar skulle skrivas över av %s."
 
-#: sequencer.c:360
+#: sequencer.c:362
 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:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
@@ -2960,20 +3046,20 @@ msgstr "%s: snabbspola"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "kunde inte bestämma HEAD:s incheckning\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "kan inte uppdatera cacheträd\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3002,17 +3088,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "kunde inte tolka incheckningen %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "kunde inte tolka föräldraincheckningen %s\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3023,7 +3109,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3034,231 +3120,232 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Det här är en kombination av %d incheckningar."
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "behöver en HEAD-incheckning att rätta"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "kunde inte läsa HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kan inte skriva \"%s\""
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "Det här är 1:a incheckningsmeddelandet:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte läsa incheckningsmeddelande för %s"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Det här är incheckningsmeddelande %d:"
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Incheckningsmeddelande %d kommer hoppas över:"
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "okänt kommando: %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, 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:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "incheckning %s har inte förälder %d"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, 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:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte ångra %s... %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillämpa %s... %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "den angivna uppsättningen incheckningar är tom"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades läsa indexet"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "kunde inte läsa \"%s\"."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rätta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvändbart manus: �%s�"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "inga incheckningar lästes."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt värde för %s: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: �%s�"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "kunde inte låsa HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestämma HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte läsa \"%s\": %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, 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:1658
+#: sequencer.c:1677
 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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "kan inte läsa HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "kunde inte läsa indexet"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3273,11 +3360,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 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:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3294,17 +3381,17 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillämpade autostash.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3315,57 +3402,57 @@ 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:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade på %s... %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "okänt kommando %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "kunde inte läsa orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "kunde inte läsa \"onto\""
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "kunde inte uppdatera %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har oköade ändringar."
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lägga till incheckning som inte finns"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehåll: \"%s\""
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3375,24 +3462,114 @@ 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:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in köade ändringar."
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte göra \"cherry-pick\" på typen �%s�"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "kan inte ångra som första incheckning"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: flaggor som inte stöds"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: fel när revisioner skulle förberedas"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "oanvändbar todo-lista: %s"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: sequencer.c:2561
+#, 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:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Varning: vissa incheckningar kan av misstag ha tappats.\n"
+"Tappade incheckningar (nyaste först):\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"För att undvika det här meddelandet kan du använda \"drop\" för att "
+"explicit\n"
+"kasta en incheckning.\n"
+"\n"
+"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
+"varningsnivån.\n"
+"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
+"\" (fel).\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
+"continue\".\n"
+"Avbryt ombaseringen med \"git rebase --abort\".\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "kunde inte tolka incheckningen\" %s\""
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "kunde inte trunkera \"%s\""
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "skriptet har redan omordnats."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "kunde inte avsluta \"%s\""
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3426,34 +3603,34 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "okända arkivutökningar hittades:"
 
-#: setup.c:810
+#: setup.c:806
 #, 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:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Kan inte byta till \"%s\""
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3463,7 +3640,7 @@ msgstr ""
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3472,55 +3649,41 @@ msgstr ""
 "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:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "sökvägen \"%s\" finns inte"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, 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:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" är grunt"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" är ympat"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset före slutet av packfilen (trasig .idx?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "kort SHA1 %s är tvetydig"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Kandidaterna är:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3542,66 +3705,71 @@ msgstr ""
 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
 "genom att köra \"git config advice.objectNameWarning false\""
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
 "sammanslagningskonflikter först"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Kunde inte uppdatera .gitmodules-posten %s"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Kunde inte ta bort .gitmodules-posten för %s"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "misslyckades köa uppdaterad .gitmodules"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "i ej utcheckad undermodul \"%s\""
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Misslyckades slå upp HEAD som giltig referens."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "\"%s\" känns inte igen som ett git-arkiv"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "undermodulen \"%s\" har ett smutsigt index"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3609,18 +3777,18 @@ msgstr ""
 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
 "stöds ej"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3631,94 +3799,98 @@ msgstr ""
 "\"%s\" till\n"
 "\"%s\"\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "kunde inte rekursera in i undermodulen \"%s\""
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "kunde inte starta ls-files i .."
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree returnerade en oväntad returkod %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "ogiltigt värde för %s"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "okänt värde \"%s\" för nyckeln \"%s\""
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "mer än en %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "tom släpradssymbol i släpraden \"%.*s\""
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "kunde inte läsa indatafilen \"%s\""
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "kunde inte läsa från standard in"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "kunde inte ta status på %s"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "filen %s är inte en normal fil"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "filen %s är inte skrivbar av användaren"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "kunde inte öppna temporär file"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "kunde inte byta namn på temporär fil till %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ogiltig flagga för depth: �%s�"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3727,7 +3899,7 @@ msgstr ""
 "Följande undermodulsökvägar innehåller ändringar som\n"
 "inte kan hittas av fjärrarna:\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3754,7 +3926,7 @@ msgstr ""
 "för att sända dem till fjärren.\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Avbryter."
 
@@ -3775,11 +3947,11 @@ msgstr "felformat läge i trädpost"
 msgid "empty filename in tree entry"
 msgstr "tomt filnamn i trädpost"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "trädfil för kort"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3788,7 +3960,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:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3797,7 +3969,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3807,7 +3979,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3817,7 +3989,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3826,7 +3998,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:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3835,7 +4007,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3845,7 +4017,7 @@ msgstr ""
 "dem:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3854,7 +4026,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:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3863,7 +4035,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3873,7 +4045,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du slår samman."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3883,7 +4055,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3892,7 +4064,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:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3901,7 +4073,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3912,7 +4084,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3923,7 +4095,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3933,7 +4105,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3943,7 +4115,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3952,7 +4124,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:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3961,21 +4133,21 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
-"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
+"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -3986,7 +4158,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -3997,7 +4169,7 @@ msgstr ""
 "utcheckning:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4006,17 +4178,12 @@ msgstr ""
 "Kan inte uppdatera undermodul:\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Avbryter\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "Checkar ut filer"
 
@@ -4059,13 +4226,8 @@ msgstr "misslyckades läsa \"%s\""
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "kunde inte öppna \"%s\" för läsning"
@@ -4089,199 +4251,199 @@ msgstr "kunde inte skriva till %s"
 msgid "could not close %s"
 msgstr "kunde inte stänga %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Ej sammanslagna sökvägar:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, 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:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 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:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (använd \"git add <fil>...\" för att ange lösning)"
 
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 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:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Ändringar att checka in:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
-#: wt-status.c:222
+#: wt-status.c:220
 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:224
+#: wt-status.c:222
 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:225
+#: wt-status.c:223
 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:227
+#: wt-status.c:225
 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:239
+#: wt-status.c:237
 #, 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:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "borttaget av bägge:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "tillagt av oss:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "borttaget av dem:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "tillagt av dem:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "borttaget av oss:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "tillagt av bägge:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "ändrat av bägge:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "ny fil:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "kopierad:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "borttagen:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "ändrad:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "namnbytt:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "typbyte:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "okänd:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "osammanslagen:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "nya incheckningar, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "ändrat innehåll, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"Rör inte raden ovan.\n"
-"Allt nedan kommer tas bort."
+"Raden ovan får inte ändras eller tas bort.\n"
+"Allt under den kommer tas bort."
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 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:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 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:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
 
@@ -4574,7 +4736,7 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
 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:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "misslyckades ta bort länken \"%s\""
@@ -4588,7 +4750,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
@@ -4597,108 +4759,108 @@ msgstr "misslyckades uppdatera filer"
 msgid "remove '%s'\n"
 msgstr "ta bort \"%s\"\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Kunde inte öppna \"%s\" för skrivning."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status på \"%s\""
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillämpa \"%s\""
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "testkörning"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "tillåt lägga till annars ignorerade filer"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "uppdatera spårade filer"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "registrera endast att sökvägen kommer läggas till senare"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "lägg till ändringar från alla spårade och ospårade filer"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "lägg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "se om - även saknade - filer ignoreras i testkörning"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "överstyr exekveringsbiten för angivna filer"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "varna när ett inbyggt arkiv läggs till"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4729,152 +4891,152 @@ msgstr ""
 "\n"
 "Se �git help submodule� för ytterligare information."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lägger till inbäddat git-arkiv: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Använd -f om du verkligen vill lägga till dem.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A och -u är ömsesidigt inkompatibla"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Kanske menade du att skriva \"git add .\"?\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "indexfilen trasig"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "kunde inte tolka författarskript"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "\"%s\" togs bort av kroken applypatch-msg"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, 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:1172
+#: builtin/am.c:1194
 #, 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:1173
+#: builtin/am.c:1195
 #, 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:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Patchen är tom."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 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:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4882,39 +5044,39 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree misslyckades skriva ett träd"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "kunde inte skriva incheckningsobjekt"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 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:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -4922,35 +5084,35 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 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:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, 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:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -4960,7 +5122,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:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -4972,17 +5134,17 @@ msgstr ""
 "lösta.\n"
 "Du kan köra �git rm� för att godta �borttagen av dem� för den."
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet �%s�."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -4990,134 +5152,133 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt värde för --patch-format: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 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:2241
+#: builtin/am.c:2240
 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:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "sänd det genom git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr "återställ originalgrenen och avbryt patchningen."
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5125,16 +5286,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:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, 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:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5143,7 +5304,7 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
@@ -5345,14 +5506,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<flaggor>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5361,7 +5526,7 @@ msgstr ""
 "tar bort grenen \"%s\" som har slagits ihop med\n"
 "         \"%s\", men ännu inte slagits ihop med HEAD."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5370,12 +5535,12 @@ msgstr ""
 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
 "         \"%s\", trots att den har slagits ihop med HEAD."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5384,92 +5549,113 @@ msgstr ""
 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"
 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "Misslyckades uppdatera konfigurationsfil"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "kan inte ange -a med -d"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "fjärrspårande grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Fel vid borttagning av grenen \"%s\""
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Tog bort grenen %s (var %s).\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "kan inte tolka formatsträng"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Grenen %s ombaseras på %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Grenen %s är i en \"bisect\" på %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Misslyckades kopiera gren"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5480,235 +5666,231 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "ställ in spårningsläge (se git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "ändra uppströmsinformation"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "använd ej"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "uppströms"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "ändra uppströmsinformationen"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "Ta bort uppströmsinformationen"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "visa endast grenar som innehåller incheckningen"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "visa endast grenar som inte innehåller incheckningen"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Specifika git-branch-åtgärder:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "visa både fjärrspårande och lokala grenar"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "flytta/ta bort en gren, även om målet finns"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "kopiera en gren och dess reflogg"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "kopiera en gren, även om målet finns"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "nyckel"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "objekt"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format att använda för utdata"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Misslyckades slå upp HEAD som giltig referens."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column och --verbose är inkompatibla"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "kan inte redigera beskrivning för mer än en gren"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "för många grenar för namnbyte"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "för många grenar för kopiering"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "för många grenar för att byta uppström"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "för många flaggor för namnbyte"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "för många flaggor för att byta uppström"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "för många grenar för att ta bort uppström"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "för många flaggor för att ta bort uppström"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "kan inte skapa \"HEAD\" manuellt"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
 "grennamn"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
-"eller --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
-"\n"
+"eller --set-upstream-to istället."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5723,7 +5905,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:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5731,7 +5913,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:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5739,64 +5921,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<typ> kan vara en av: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "visa objekttyp"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 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:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "visa objektets innehåll snyggt"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 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:566
+#: builtin/cat-file.c:568
 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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "använd specifik sökväg för --textconv/--filters"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 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:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "buffra utdata från --batch"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 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:576
+#: builtin/cat-file.c:578
 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:579
+#: builtin/cat-file.c:581
 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:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "visa alla objekt med --batch eller --batch-check"
 
@@ -5824,7 +6006,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:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
@@ -5914,9 +6096,9 @@ msgid "write the content to temporary files"
 msgstr "skriv innehåll till temporära filer"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "sträng"
 
@@ -5987,54 +6169,54 @@ msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6057,7 +6239,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6084,161 +6266,161 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 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:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "endast en referens förväntades, %d gavs."
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "sätt uppströmsinformation för ny gren"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 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:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "konfliktstil (merge eller diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "tvinga förloppsrapportering"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Grennamn saknas; försök med -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, 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:1272
+#: builtin/checkout.c:1281
 #, 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:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6278,7 +6460,7 @@ msgstr "Skulle hoppa över arkivet %s\n"
 msgid "failed to remove %s"
 msgstr "misslyckades ta bort %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6291,7 +6473,7 @@ msgstr ""
 "foo        - markera post baserad på unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6312,38 +6494,38 @@ msgstr ""
 "*          - välj alla poster\n"
 "           - (tomt) avsluta markering\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Vadå (%s)?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmönster>>"
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "VARNING: Hittar inte poster som motsvarar: %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Välj poster att ta bort"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Hej då.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6361,63 +6543,63 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Kommandon ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Vad nu"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Skulle ta bort följande post:"
 msgstr[1] "Skulle ta bort följande poster:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att städa, avslutar."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn på borttagna filer"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "städa interaktivt"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "mönster"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "ta även bort ignorerade filer"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x och -X kan inte användas samtidigt"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6425,7 +6607,7 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
 "städa"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6433,142 +6615,142 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "för att klona från ett lokalt arkiv"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "skapa inte lokala hårda länkar, kopiera alltid"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "skapa som ett delat arkiv"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "sökvägsangivelse"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "initiera undermoduler i klonen"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "antal undermoduler som klonas parallellt"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "katalog att använda mallar från"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "använd --reference endast under kloningen"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "namn"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 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:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checka ut <gren> istället för fjärrens HEAD"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "djup"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "tid"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon från en angiven tidpunkt"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "fördjupa historik för grund klon, exkludera revisionen"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 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:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "klonade undermoduler kommer vara grunda"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6576,42 +6758,42 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog på kommandoraden"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, 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:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "misslyckades ta status på %s\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6621,138 +6803,138 @@ 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:559
+#: builtin/clone.c:560
 #, 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:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "fjärren sände inte alla nödvändiga objekt"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 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:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "flaggorna --bare och --origin %s är inkompatibla."
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, 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:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 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:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 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:1071
+#: builtin/clone.c:1075
 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:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Vet inte hur man klonar %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -6892,61 +7074,61 @@ msgstr ""
 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
 "cherry-pick för återstående incheckningar.\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 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:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -6954,38 +7136,38 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 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:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte läsa MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7000,7 +7182,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7015,7 +7197,7 @@ msgstr ""
 "\t%s\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7025,7 +7207,7 @@ msgstr ""
 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
 "incheckningen.\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7036,146 +7218,146 @@ 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:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, 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:1068
+#: builtin/commit.c:1075
 #, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long och -z är inkompatibla"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 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:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 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:1165
+#: builtin/commit.c:1172
 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:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 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:1180
+#: builtin/commit.c:1187
 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:1188
+#: builtin/commit.c:1195
 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:1205
+#: builtin/commit.c:1212
 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:1207
+#: builtin/commit.c:1214
 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:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "Kan inte ange sökvägar med -a."
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "visa status i långt format (standard)"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "läge"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "visa ignorerade filer"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7183,201 +7365,202 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slå upp en precis skapad incheckning"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "frånkopplad HEAD"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "återanvänd och redigera meddelande från angiven incheckning"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "återanvänd meddelande från angiven incheckning"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 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:1599
+#: builtin/commit.c:1608
 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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "lägg till Signed-off-by:"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "standard"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "inkludera status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "lägg till angivna filer till indexet för incheckning"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en ändring med tomt meddelande"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "kunde inte tolka HEAD:s incheckning"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
+
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7543,12 +7726,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "kan inte skapa konfigurationsfilen \"%s\""
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7557,11 +7740,11 @@ msgstr ""
 "kan inte skriva över flera värden med ett ensamt värde\n"
 "       Använd en regexp, --add eller --replace-all för att ändra %s."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "skriv storlekar i människoläsbart format"
 
@@ -7585,47 +7768,47 @@ msgstr "lättviktig"
 msgid "annotated"
 msgstr "annoterad"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "den annoterade taggen %s inte tillgänglig"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "den annoterade taggen %s har inget inbäddat namn"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet är inte giltigt: %s"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s är inte ett giltigt \"%s\"-objekt"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ingen tagg motsvarar \"%s\" exakt"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "söker för att beskriva %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "avslutade sökning på %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7634,7 +7817,7 @@ msgstr ""
 "Inga annoterade taggar kan beskriva \"%s\".\n"
 "Det finns dock oannoterade taggar: testa --tags."
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7643,12 +7826,12 @@ msgstr ""
 "Inga taggar kan beskriva \"%s\".\n"
 "Testa --always, eller skapa några taggar."
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "traverserade %lu incheckningar\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7657,75 +7840,75 @@ msgstr ""
 "mer än %i taggar hittades; listar de %i senaste\n"
 "gav upp sökningen vid %s\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "hitta taggen som kommer efter incheckningen"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "felsök sökstrategin på standard fel"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "använd alla referenser"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "använd alla taggar, även oannoterade"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "använd alltid långt format"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "följ endast första föräldern"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "skriv endast ut exakta träffar"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "överväg de <n> nyaste taggarna (standard: 10)"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "överväg endast taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "överväg inte taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "märke"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long är inkompatibel med --abbrev=0"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva något."
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
 
@@ -7739,21 +7922,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk"
 msgid "invalid option: %s"
 msgstr "ogiltig flagga: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "Inte ett git-arkiv"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objektet \"%s\" som angavs är felaktigt."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blobbar angavs: \"%s\""
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ej hanterat objekt \"%s\" angavs."
@@ -7763,27 +7946,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "misslyckades: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "kunde inte läsa symbolisk länk-fil %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "kunde inte läsa objektet %s för symboliska länken %s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7791,53 +7974,53 @@ msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
 "katalogdiffläge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lämnades kvar."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporära filer finns i \"%s\"."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "du kanske vill städa eller rädda dem."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "utför diff för hela katalogen"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "fråga inte vid start av diff-verktyg"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "använd symboliska länkar i katalogdiffläge"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<verktyg>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "använd angivet diff-verktyg"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "visa en lista över diff-verktyg som kan användas med �--tool�"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -7845,19 +8028,19 @@ msgstr ""
 "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
 "skilt från noll"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<kommando>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando för att visa diffar"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
@@ -7865,143 +8048,143 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-flaggor]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "visa förlopp efter <n> objekt"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "välj hantering av signerade taggar"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "välj hantering av taggar som har taggfiltrerade objekt"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "Dump märken till filen"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "Importera märken från filen"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "Fejka taggare när taggen saknar en"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Skriv ut hela trädet för varje incheckning"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "Använd done-funktionen för att avsluta strömmen"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "Hoppa över skrivning av blob-data"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "Applicera referensspecifikation på exporterade referenser"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 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:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hämta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
 
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "fördjupa historik för grund klon"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "fördjupa historik för grund klon baserad på tid"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "kat"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "lägg till i början av undermodulens sökvägsutdata"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8009,89 +8192,89 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "Kunde inte hitta fjärr-referensen HEAD"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, 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:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, 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:767
+#: builtin/fetch.c:789
 #, 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:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8100,55 +8283,55 @@ 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:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, 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:997
+#: builtin/fetch.c:1019
 #, 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:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Flaggan \"%s\" ignoreras för %s\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "Vet inte hur man hämtar från %s"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Kunde inte hämta %s"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8156,40 +8339,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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Du måste ange namnet på en tagg."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen och --depth är ömsesidigt uteslutande"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth och --unshallow kan inte användas samtidigt"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte användas på ett komplett arkiv"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Fjärren eller fjärrgruppen finns inte: %s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
 
@@ -8199,23 +8382,23 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "fyll i loggen med som mest <n> poster från shortlog"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "alias för --log (avråds)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "inled meddelande med <text>"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "fil att läsa från"
 
@@ -8256,103 +8439,107 @@ 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:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "använd formatfärger"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "visa endast referenser som pekar på objektet"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "visa endast referenser som slagits samman"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "visa endast referenser som ej slagits samman"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "visa endast referenser som innehåller incheckningen"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehåller incheckningen"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 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:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<flaggor>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Misslyckades ta status (fstat) på %s: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kan inte ta status på %s"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8367,43 +8554,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "rensa ej refererade objekt"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "var mer grundlig (ökar körtiden)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-läge"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 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:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Kan inte tolka värdet %s för gc.logexpiry"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, 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:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, 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:432
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8411,7 +8598,7 @@ msgstr ""
 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
 "är fallet)"
 
-#: builtin/gc.c:476
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8422,12 +8609,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: misslyckades skapa tråd. %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -8436,249 +8623,241 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trådstöd saknas, ignorerar %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte läsa träd (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "sök varje undermodul rekursivt"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "basnamn"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "lägg till föräldraprojektets basnamn i utdata"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "matcha endast mönster vid ordgränser"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 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:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 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:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 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:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "visa analysträd för grep-uttryck"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "inget mönster angavs."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte användas med revisioner"
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slå upp revision: %s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "trådstöd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "flaggan stöds inte med --recurse-submodules."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached och --untracked kan inte användas med --no-index."
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 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:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "både --cached och träd angavs."
 
@@ -8770,12 +8949,12 @@ msgstr "Kunde inte tolka emacsclient-version."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "exec misslyckades för \"%s\""
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8784,7 +8963,7 @@ msgstr ""
 "\"%s\": sökväg för man-visare som ej stöds.\n"
 "Använd \"man.<verktyg>.cmd\" istället."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8793,351 +8972,351 @@ msgstr ""
 "\"%s\": kommando för man-visare som stöds.\n"
 "Använd \"man.<verktyg>.path\" istället."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "\"%s\": okänd man-visare."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "ingen man-visare hanterade förfrågan"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "ingen info-visare hanterade förfrågan"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "Definierar attribut per sökväg"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Git för dagligt bruk i ungefär 20 kommandon"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "En Git-ordlista"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Ange avsiktligen ospårade filer att ignorera"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "Ange egenskaper för undermoduler"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Ange versioner och intervall i Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Introduktion till Git (för version 1.5.1 och senare)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Översikt över rekommenderade arbetsflöden med Git"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "De vanliga Git-vägledningarna är:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "\"git %s\" är ett alias för \"%s\""
+msgid "'%s' is aliased to '%s'"
+msgstr "\"%s\" är ett alias för \"%s\""
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "kunde inte öppna %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "objekttyp stämmer inte överens vid %s"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "emottog inte det förväntade objektet %s"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, 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:270
+#: builtin/index-pack.c:271
 #, 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:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "tidigt filslut"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "indataläsfel"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "använde fler byte än tillgängligt"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 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:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "kunde inte skapa \"%s\""
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "kan inte öppna paketfilen \"%s\""
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "paketsignatur stämmer inte överens"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paketversion %<PRIu32> stöds ej"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate returnerade %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "indexvärdespill för deltabasobjekt"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "deltabasindex utanför gränsen"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "okänd objekttyp %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "kan inte utföra \"pread\" på paketfil"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "kunde inte läsa %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte läsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte läsa befintligt objekt %s"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Fel i objekt"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "misslyckades tillämpa delta"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "Tar emot objekt"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Skapar index för objekt"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paketet är trasigt (SHA1 stämmer inte)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "kan inte utföra \"fstat\" på paketfil"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "paket har skräp i slutet"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "förvirrad bortom vanvett i parse_pack_objects()"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "Analyserar delta"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kunde inte skapa tråd: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "förvirrad bortom vanvett"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "slutfördes med %d lokalt objekt"
 msgstr[1] "slutfördes med %d lokala objekt"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paketet har %d oanalyserat delta"
 msgstr[1] "paketet har %d oanalyserade delta"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "fel vid stängning av paketfil"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "kan inte spara paketfil"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "kan inte spara indexfil"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, 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:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: 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:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin kan inte användas med --stdin"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
@@ -9269,132 +9448,164 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<symbol>[(=|:)<värde>])...] [<fil>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "redigera filer på plats"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "ta bort tomma släprader"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "var nya släprader skall placeras"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "att göra om släprader redan finns"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "att göra om släprader saknas"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "visa endast släprader"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "använd inte regler från konfigurationen"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "slå ihop värden avdelade med blanksteg"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "välj tolkningsalternativ"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "släprad"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "släprad(er) att lägga till"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer med --only-input ger ingen mening"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "ingen indatafil angiven för redigering på plats"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<flaggor>] <objekt>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga för --decorate: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "visa källkod"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "Använd e-postmappningsfil"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 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:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kunde inte läsa objektet %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Okänd typ: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "namnet på utdatakatalogen är för långt"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kan inte öppna patchfilen %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Behöver precis ett intervall."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "Inte ett intervall."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "Omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Två utdatakataloger?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Okänd incheckning %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "Kunde inte hitta exakt sammanslagningsbas."
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9405,320 +9616,328 @@ msgstr ""
 "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
 "manuellt."
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "Kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bör vara förfader till revisionslistan"
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 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:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Använd  [RFC PATCH] istället för [PATCH]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 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:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "lägg till förhandskrävd trädinfo i patchserien"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "visa förloppsindikator medan patchar skapas"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "standard ut, eller katalog, vilken skall det vara?"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Kunde inte skapa katalogen \"%s\""
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Skapar patchar"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "Misslyckades skapa utdatafiler"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "identifiera filstatus med taggar"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "visa cachade filer i utdata (standard)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "visa borttagna filer i utdata"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "visa modifierade filer i utdata"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "visa andra filer i utdata"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "visa ignorerade filer i utdata"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "visa köat innehålls objektnamn i utdata"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "visa filer i filsystemet som behöver tas bort"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "visa endast namn för \"andra\" kataloger"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "visa radslut i filer"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "visa inte tomma kataloger"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "visa ej sammanslagna filer i utdata"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "visa \"resolve-undo\"-information"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "hoppa över filer som motsvarar mönster"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "exkludera mönster som läses från <fil>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "lägg till git:s standardexkluderingar"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "gör utdata relativ till projektets toppkatalog"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "träd-igt"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "visa felsökningsutdata"
 
@@ -9809,179 +10028,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
 msgid "empty mbox: '%s'"
 msgstr "tom mbox: �%s�"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<flaggor>] [<incheckning>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "visa en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istället för en sammanslagning"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "bekräfta commit-msg-krok"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (inget att platta till)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:447
+#: 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:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Felaktig flagga för merge-recursive: -X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, 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:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9997,69 +10220,69 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, 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:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, 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:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, 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:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10067,7 +10290,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10075,114 +10298,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:1191
+#: builtin/merge.c:1218
 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:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Du kan inte kombinera --squash med --no-ff."
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 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:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 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:1268
+#: builtin/merge.c:1295
 #, 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:1271
+#: builtin/merge.c:1298
 #, 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:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Incheckning %s har inte någon GPG-signatur."
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, 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:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "Redan à jour."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "Redan à jour. Toppen!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, 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:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10324,7 +10547,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Katalogen %s är i indexet och inte en undermodul?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
@@ -10342,68 +10565,68 @@ msgstr "tvinga flytta/ändra namn även om målet finns"
 msgid "skip move/rename errors"
 msgstr "hoppa över fel vid flytt/namnändring"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destinationen \"%s\" är ingen katalog"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "felaktig källa"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "kan inte flytta katalog till sig själv"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "kan inte flytta katalog över fil"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "källkatalogen är tom"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "inte versionshanterad"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "destinationen finns"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "skriver över \"%s\""
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "Kan inte skriva över"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "flera källor för samma mål"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, källa=%s, mål=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
@@ -10595,19 +10818,19 @@ 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:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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 "kunde inte slå upp \"%s\" som en giltig referens."
@@ -10635,47 +10858,47 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "för många parametrar"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "inga anteckningar hittades för objektet %s."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "anteckningsinnehåll som sträng"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "anteckningsinnehåll i en fil"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "återanvänd och redigera angivet anteckningsobjekt"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "återanvänd angivet anteckningsobjekt"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "tillåt lagra tom anteckning"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "ersätt befintliga anteckningar"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10684,29 +10907,29 @@ msgstr ""
 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Skriver över befintliga anteckningar för objektet %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Tar bort anteckning för objektet %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "läs objekt från standard in"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "för få parametrar"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10715,12 +10938,12 @@ msgstr ""
 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10729,52 +10952,52 @@ msgstr ""
 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "misslyckades bestämma NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "misslyckades färdigställa sammanslagning av anteckningar"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Flaggor för sammanslagning"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10782,48 +11005,48 @@ msgstr ""
 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "Checkar in ej sammanslagna anteckningar"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "färdigställ sammanslagning av anteckningar genom att checka in ej "
 "sammanslagna anteckningar"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Avbryt lösning av sammanslagning av anteckningar"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "avbryt sammanslagning av anteckningar"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "måste ange en antecknings-referens att slå ihop"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "okänd -s/--strategy: %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10834,221 +11057,221 @@ msgstr ""
 "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
 "sammanslagningen med \"git notes merge --abort\".\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objektet %s har ingen anteckning\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "rapportera borttagna anteckningar"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "anteckningar-ref"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okänt underkommando: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 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:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 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:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "visa inte förloppsindikator"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "visa förloppsindikator"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "visa förloppsindikator under objektskrivningsfasen"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "som --all-progress när förloppsindikatorn visas"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från alternativa objektlager"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 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:2899
+#: builtin/pack-objects.c:2905
 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:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 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:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 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:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "inkludera objekt som kan nås från någon referens"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr "inkludera objekt som refereras från referensloggposter"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "inkludera objekt som refereras från indexet"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inkludera taggobjekt som refererar objekt som skall packas"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "packa lösa onåbara objekt"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 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:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
@@ -11064,11 +11287,11 @@ msgstr "packa allt"
 msgid "prune loose refs (default)"
 msgstr "ta bort lösa referenser (standard)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "Tar bort duplicerade objekt"
 
@@ -11109,7 +11332,7 @@ msgstr "Alternativ gällande sammanslagning"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "tillåt snabbspolning"
 
@@ -11130,7 +11353,7 @@ msgstr "antal undermoduler som hämtas parallellt"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Felaktigt värde för pull.ff: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11138,14 +11361,14 @@ msgstr ""
 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11153,7 +11376,7 @@ msgstr ""
 "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
 "motsvarade något i fjärränden."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11164,42 +11387,42 @@ msgstr ""
 "gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
 "standard för aktuell gren måste du ange en gren på kommandoraden."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Du är inte på någon gren för närvarande."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Ange vilken gren du vill ombasera mot."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Ange vilken gren du vill slå samman med."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) för detaljer."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<fjärr>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<gren>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spårningsinformation för aktuell gren."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 "Om du vill ange spårningsinformation för grenen kan du göra det med:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11208,27 +11431,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:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash är endast giltig med --rebase."
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 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:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11239,7 +11462,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11256,15 +11479,15 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
@@ -11643,19 +11866,47 @@ msgstr "felsök unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<flaggor>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "behåll tomma incheckningar"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "fortsätt ombasering"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "avbryt ombasering"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "skapa ombaseringsskript"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "förkorta SHA-1 i todo-listan"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "utöka SHA-1 i todo-listan"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "kontrollera todo-listan"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "hoppa över onödiga \"pick\"-kommandon"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "ordna om fixup-/squash-rader"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11685,7 +11936,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:858
+#: builtin/receive-pack.c:859
 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"
@@ -11706,11 +11957,11 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Du måste ange en katalog."
 
@@ -11860,12 +12111,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "fjärrarkivet %s finns redan."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
@@ -11888,17 +12139,17 @@ msgstr "(matchande)"
 msgid "(delete)"
 msgstr "(ta bort)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Inget sådant fjärrarkiv: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11909,17 +12160,17 @@ msgstr ""
 "\t%s\n"
 "\tUppdatera konfigurationen manuellt om nödvändigt."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "misslyckades skapa \"%s\""
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11933,113 +12184,113 @@ msgstr[1] ""
 "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
 "för att ta bort dem, använd:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ny (nästa hämtning sparar i remotes/%s)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " spårad"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ombaseras interaktivt på fjärren %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ombaseras på fjärren %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " sammanslås med fjärren %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "sammanslås med fjärren %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    och med fjärren %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "skapa"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "ta bort"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "àjour"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "kan snabbspolas"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "lokal föråldrad"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s tvingar till %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s sänder till %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s tvingar till %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s sänder till %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "fråga inte fjärrar"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* fjärr %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Hämt-URL: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
@@ -12047,184 +12298,184 @@ msgstr "(ingen URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sänd-URL: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(inte förfrågad)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjärrgren:%s"
 msgstr[1] "  Fjärrgrenar:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (status inte förfrågad)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokal gren konfigurerad för \"git pull\":"
 msgstr[1] "  Lokala grenar konfigurerade för \"git pull\":"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokal referens konfigurerad för \"git push\"%s:"
 msgstr[1] "  Lokala referenser konfigurerade för \"git push\"%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestämma HEAD på fjärren"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte ställa in %s"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "rensa fjärrar efter hämtning"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sådan fjärr \"%s\""
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "lägg till gren"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "ingen fjärr angavs"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "fråga sänd-URL:er istället för hämta-URL:er"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna för fjärren \"%s\""
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar för sändning"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "lägg till URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mönster: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sådan URL hittades: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "var pratsam; måste skrivas före ett underkommando"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Okänt underkommando: %s"
@@ -12322,7 +12573,7 @@ msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable och -A kan inte användas samtidigt"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "misslyckades ta bort \"%s\""
@@ -12455,120 +12706,120 @@ msgstr "sammanslagning"
 msgid "keep"
 msgstr "behåll"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta träder för HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta träder för %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, 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:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "återställ HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 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:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, 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:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 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:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte göra %s återställning med sökvägar."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, 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:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N kan endast användas med --mixed"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list stöder inte visning av anteckningar"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "behåll \"--\" sänt som argument"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "sluta tolka efter första argument som inte är flagga"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "utdata fast i lång form"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12660,11 +12911,11 @@ msgstr "tillåt incheckningar med tomt meddelande"
 msgid "keep redundant, empty commits"
 msgstr "behåll redundanta, tomma incheckningar"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "\"revert\" misslyckades"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" misslyckades"
 
@@ -12732,17 +12983,17 @@ msgstr "tillåt rekursiv borttagning"
 msgid "exit with a zero status even if nothing matched"
 msgstr "avsluta med nollstatus även om inget träffades"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tar inte bort \"%s\" rekursivt utan -r"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: kan inte ta bort %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "kunde inte ta bort \"%s\""
@@ -12779,27 +13030,27 @@ msgstr "visa status från fjärrhjälpare"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "Gruppera efter incheckare istället för författare"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "sortera utdata enligt antal incheckningar per författare"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Visa e-postadress för varje författare"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Radbryt utdata"
 
@@ -12999,35 +13250,35 @@ 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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sådan referens: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Förväntade fullt referensnamn, fick %s"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, 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:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, 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:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13036,79 +13287,79 @@ msgstr ""
 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
 "officiella uppström."
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, 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:410
+#: builtin/submodule--helper.c:404
 #, 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:420
+#: builtin/submodule--helper.c:414
 #, 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:427
+#: builtin/submodule--helper.c:421
 #, 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:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "Dölj utdata från initiering av undermodul"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<sökväg>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, 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:611
+#: builtin/submodule--helper.c:604
 #, 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:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen skall klonas till"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "tvinga kloningsförlopp"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13116,82 +13367,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:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsökvägen �%s�"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "sökväg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 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:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 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:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 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:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 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:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13200,20 +13451,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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stöder inte --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -13226,24 +13477,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <namn>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "ta bort symbolisk referens"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "förkorta ref-utdata"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "skäl"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "skäl till uppdateringen"
 
@@ -13273,17 +13524,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <taggnamn>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "taggen \"%s\" hittades inte."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tog bort tagg \"%s\" (var %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13296,7 +13547,7 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13311,142 +13562,142 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
 "du vill.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "kunde inte signera taggen"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "kunde inte skriva tagg-filen"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "felaktig objekttyp."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Taggmeddelandet har lämnats i %s\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "lista taggnamn"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "visa <n> rader från varje taggmeddelande"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "ta bort taggar"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "verifiera taggar"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Alternativ för att skapa taggar"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "annoterad tagg, behöver meddelande"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "taggmeddelande"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "annoterad och GPG-signerad tagg"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "använd annan nyckel för att signera taggen"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "skapa en reflog"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "lista taggar i spalter"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "visa endast taggar som innehåller incheckningen"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "visa endast taggar som inte innehåller incheckningen"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "visa endast taggar som slagits samman"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "visa endast taggar som ej slagits samman"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column och -n är inkompatibla"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "Flaggan -n är endast tillåten i listläge"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "Flaggan --contains är endast tillåten i listläge"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Flaggan --no-contains är endast tillåten i listläge"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "Flaggan --points-at är endast tillåten i listläge"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 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:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "endast en av flaggorna -F eller -m tillåts."
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "för många parametrar"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -13516,127 +13767,127 @@ msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "fortsätt uppdatera även när index inte är àjour"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignorera undermoduler"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "ignorera inte nya filer"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "låt filer ersätta kataloger och omvänt"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "lägg märke till filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "uppdatera statusinformation"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "som --refresh, men ignorera assume-unchanged-inställning"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<läge>,<objekt>,<sökväg>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "lägg till angiven post i indexet"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "markera filer som \"ändras inte\""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "rensa \"assume-unchanged\"-biten"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "markera filer som \"endast index\""
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "töm \"skip-worktree\"-biten"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "med --stdin: indatarader termineras med null-byte"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "läs lista över sökvägar att uppdatera från standard in"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "lägg poster från standard in till indexet"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "uppdatera endast poster som skiljer sig från HEAD"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "ignorera filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "rapportera åtgärder på standard ut"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(för porslin) glöm sparade olösta konflikter"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "skriv index i detta format"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "aktivera eller inaktivera delat index"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "aktivera/inaktivera ospårad cache"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "testa om filsystemet stöder ospårad cache"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktivera ospårad cache utan att testa filsystemet"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13644,7 +13895,7 @@ msgstr ""
 "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
 "vill aktivera delat index"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13652,7 +13903,7 @@ msgstr ""
 "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
 "vill inaktivera delat index"
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13660,11 +13911,11 @@ msgstr ""
 "core.untrackedCache är satt till true; ta bort eller ändra det om du "
 "verkligen vill inaktivera den ospårade cachen"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "Ospårad cache är inaktiverad"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13672,7 +13923,7 @@ msgstr ""
 "core.untrackedCache är satt till false; ta bort eller ändra det om du "
 "verkligen vill aktivera den ospårade cachen"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Ospårad cache är aktiverad för \"%s\""
@@ -13689,19 +13940,19 @@ msgstr "git update-ref [<flaggor>]    <refnamn> <gammaltvärde> [<nyttvärde>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<flaggor>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "ta bort referensen"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "uppdatera <refnamn> inte det den pekar på"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "standard in har NUL-terminerade argument"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "läs uppdateringar från standard in"
 
@@ -13765,103 +14016,112 @@ msgstr "git worktree prune [<flaggor>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sökväg>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Tar bort worktrees/%s: inte en giltig katalog"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, 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:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
+"%<PRIuMAX>)"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, 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:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Förbereder %s (identifieraren %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 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:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B och --detach är ömsesidigt uteslutande"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "orsak till lås"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "\"%s\" är inte en arbetskatalog"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
@@ -13886,23 +14146,23 @@ msgstr "endast användbart vid felsökning"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<flaggor>] <katalog>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 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:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 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:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13915,7 +14175,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "skriv felsökningsmeddelanden på standard fel"
 
@@ -13929,20 +14189,20 @@ 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:337
+#: http.c:338
 #, 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:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
 
-#: http.c:367
+#: http.c:368
 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:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14313,7 +14573,7 @@ msgstr "Kunde inte hitta gemensam incheckning med $pretty_name"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "Redan à jour med $pretty_name"
 
 #: git-merge-octopus.sh:89
@@ -14332,50 +14592,53 @@ msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning.
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"När du har löst problemet kör du \"git rebase --continue\".\n"
-"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
-"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
+"Lös alla konflikter manuellt, märk dem som lösta med\n"
+"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n"
+"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n"
+"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
+"rebase --abort\"."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Kunde inte flytta tillbaka till $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "Tillämpade autostash."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kan inte spara $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 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:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 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:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14383,7 +14646,7 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14404,102 +14667,102 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där."
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "ogiltig uppström $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: mer än en sammanslagningsbas finns"
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: ingen sammanslagningsbas finns"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "Peka på en giltig incheckning: $onto_name"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "ödesdigert: ingen sådan gren: $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "Kan inte utföra \"autostash\""
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Skapade autostash: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "Aktuell gren $branch_name är à jour."
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, 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:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Ändringar från $mb till $onto:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 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:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Snabbspolade $branch_name till $onto_name."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "\"git stash clear\" med parametrar har inte implementerats"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "Du har inte den första incheckningen ännu"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstånd för indexet"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospårade filer"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "Inga ändringar valda"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "Kan inte registrera tillstånd för arbetskatalog"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Kan inte uppdatera $ref_stash med $w_commit"
@@ -14514,7 +14777,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14523,107 +14786,107 @@ msgstr ""
 "fel: felaktig flagga för \"stash save\": $option\n"
 "     För att ange ett meddelande, använd git stash save -- \"$option\""
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "Inga lokala ändringar att spara"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "okänd flagga: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "Inga \"stash�-poster hittades."
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "För många revisioner angivna: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference är inte en giltig referens"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "\"$args\" är inte en \"stash\"-referens"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "kan inte uppdatera indexet"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 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:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikter i indexet. Testa utan --index."
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "Kunde inte spara indexträd"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr "Kunde inte återställa ospårade filer från stash-post"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "Kan inte ta bort ändrade filer ur kön"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits ur kön."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 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:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Kastade ${REV} ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Kunde inte kasta \"stash\"-post"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(För att återställa dem, skriv \"git stash apply\")"
 
@@ -14770,17 +15033,17 @@ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, 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:648
+#: git-submodule.sh:647
 #, 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:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14789,12 +15052,12 @@ msgstr ""
 "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
 "undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14803,84 +15066,84 @@ msgstr ""
 "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
 "Direkt hämtning av incheckningen misslyckades."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, 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:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, 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:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, 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:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Flaggan --cached kan inte användas med flaggan --files"
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "oväntat läge $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, 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:916
+#: git-submodule.sh:915
 #, 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:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synkroniserar undermodul-url för \"$displaypath\""
@@ -14899,27 +15162,27 @@ msgstr "Ombaserar ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 "\n"
 "Kommandon:\n"
-" p, pick = använd incheckning\n"
-" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
-" e, edit = använd incheckning, men stanna för tillägg\n"
-" s, squash = använd incheckning, men infoga i föregående incheckning\n"
-" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
-" x, exec = kör kommando (resten av raden) i skalet\n"
-" d, drop = ta bort incheckning\n"
+"p, pick = använd incheckning\n"
+"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
+"e, edit = använd incheckning, men stanna för tillägg\n"
+"s, squash = använd incheckning, men infoga i föregående incheckning\n"
+"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
+"x, exec = kör kommando (resten av raden) i skalet\n"
+"d, drop = ta bort incheckning\n"
 "\n"
-"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n"
+"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
 
 #: git-rebase--interactive.sh:171
 msgid ""
@@ -14991,49 +15254,49 @@ msgstr "Kan inte flytta HEAD till $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Fel när sammanslagningen $sha1 skulle göras om"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Kunde inte välja $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Det här är incheckningsmeddelande ${n}:"
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kan inte skriva $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "Det här är en kombination av 2 incheckningar."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Kunde inte tillämpa $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15047,31 +15310,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:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Stoppade på $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, 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:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Kör: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Körning misslyckades: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 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:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15082,7 +15345,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15097,96 +15360,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Okänt kommando: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Rätta det med \"git rebase --edit-todo\"."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Lyckades ombasera och uppdatera $head_name."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Varning: kommandot kändes inte igen på följande rad:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla från HEAD"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Varning: vissa incheckningar kan av misstag ha tappats.\n"
-"Tappade incheckningar (nyaste först):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"För att undvika det här meddelandet kan du använda \"drop\" för att "
-"explicit\n"
-"kasta en incheckning.\n"
-"\n"
-"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
-"varningsnivån.\n"
-"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
-"\" (fel)."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
-"continue\"."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15217,11 +15413,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 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:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15229,11 +15425,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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "Kunde inte checka in köade ändringar."
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15247,40 +15443,40 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "Kunde inte starta textredigerare"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Kunde inte checka ut $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "Inget HEAD?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Kunde inte skapa temporär $state_dir"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "Kunde inte markera som interaktiv"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "Kunde inte initiera omskrivna incheckningar"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15290,7 +15486,7 @@ msgstr ""
 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Observera att tomma incheckningar är utkommenterade"
 
@@ -15871,61 +16067,61 @@ msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
 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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, 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:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 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:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Okänd inställning i --confirm: \"%s\"\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, 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:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "varning: \":include:\" stöds inte: %s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, 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:518
+#: git-send-email.perl:513
 #, 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:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15940,12 +16136,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:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Misslyckades utföra opendir %s: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -15954,7 +16150,7 @@ msgstr ""
 "ödesdigert: %s: %s\n"
 "varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -15964,17 +16160,17 @@ msgstr ""
 "Inga patchfiler angavs!\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ingen ärenderad i %s?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Kunde inte öppna för skrivning %s: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15988,42 +16184,42 @@ msgstr ""
 "\n"
 "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Misslyckades öppna %s.final: %s"
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Misslyckades öppna %s: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 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:791
+#: git-send-email.perl:786
 #, 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:820
+#: git-send-email.perl:815
 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:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16036,21 +16232,21 @@ msgstr ""
 "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
 "vill sända.\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Till vem skall breven sändas (om någon)?"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, 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"
@@ -16058,16 +16254,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:944
+#: git-send-email.perl:939
 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:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA-sökvägen \"%s\" finns inte"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16094,124 +16290,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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Svar krävs på frågan \"Sända brevet?\""
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "Nödvändig SMTP-server har inte angivits korrekt."
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servern stöder inte SMARTTLS! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS misslyckades! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 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:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Misslyckades sända %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test-Sände %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Sände %s\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Test-OK. Loggen säger:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK. Loggen säger:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Resultat: OK\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, 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:1534
+#: git-send-email.perl:1549
 #, 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:1582
+#: git-send-email.perl:1597
 #, 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:1605
+#: git-send-email.perl:1622
 #, 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:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Kunde inte köra \"%s\""
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, 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:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) misslyckades stänga röret till \"%s\""
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "kan inte sända brev som sjubitars"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "ogiltig överföringskondning"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, 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:1814
+#: git-send-email.perl:1831
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
@@ -16219,59 +16415,71 @@ msgstr ""
 "säkerhetskopior.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) tar inte argument"
+
+#~ msgid ""
+#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
+#~ msgstr ""
+#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
+#~ msgid "%"
+#~ msgid_plural "%"
+#~ msgstr[0] "%"
+#~ msgstr[1] "%"
+
+#~ msgid "%s, %"
+#~ msgid_plural "%s, %"
+#~ msgstr[0] "%s. %"
+#~ msgstr[1] "%s. %"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
+
+#~ msgid "change upstream info"
+#~ msgstr "ändra uppströmsinformation"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "basnamn"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "lägg till föräldraprojektets basnamn i utdata"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Varning: kommandot kändes inte igen på följande rad:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
+
 #~ msgid "Could not open file '%s'"
 #~ msgstr "Kunde inte öppna filen \"%s\""
 
-#~ msgid "%lu second ago"
-#~ msgid_plural "%lu seconds ago"
-#~ msgstr[0] "%lu sekund sedan"
-#~ msgstr[1] "%lu sekunder sedan"
-
-#~ msgid "%lu minute ago"
-#~ msgid_plural "%lu minutes ago"
-#~ msgstr[0] "%lu minut sedan"
-#~ msgstr[1] "%lu minuter sedan"
-
-#~ msgid "%lu hour ago"
-#~ msgid_plural "%lu hours ago"
-#~ msgstr[0] "%lu timme sedan"
-#~ msgstr[1] "%lu timmar sedan"
-
-#~ msgid "%lu day ago"
-#~ msgid_plural "%lu days ago"
-#~ msgstr[0] "%lu dag sedan"
-#~ msgstr[1] "%lu dagar sedan"
-
-#~ msgid "%lu week ago"
-#~ msgid_plural "%lu weeks ago"
-#~ msgstr[0] "%lu vecka sedan"
-#~ msgstr[1] "%lu veckor sedan"
-
-#~ msgid "%lu month ago"
-#~ msgid_plural "%lu months ago"
-#~ msgstr[0] "%lu månad sedan"
-#~ msgstr[1] "%lu månader sedan"
-
-#~ msgid "%lu year"
-#~ msgid_plural "%lu years"
-#~ msgstr[0] "%lu år"
-#~ msgstr[1] "%lu år"
-
-#~ msgid "%s, %lu month ago"
-#~ msgid_plural "%s, %lu months ago"
-#~ msgstr[0] "%s, %lu månad sedan"
-#~ msgstr[1] "%s, %lu månader sedan"
-
-#~ msgid "%lu year ago"
-#~ msgid_plural "%lu years ago"
-#~ msgstr[0] "%lu år sedan"
-#~ msgstr[1] "%lu år sedan"
-
 #~ msgid "in %0.1f seconds automatically..."
 #~ msgstr "automatiskt om %0.1f sekunder..."
 
@@ -16727,9 +16935,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Forward-port local commits to the updated upstream head"
 #~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
 
-#~ msgid "unable to parse format"
-#~ msgstr "kan inte tolka formatet"
-
 #~ msgid "improper format entered align:%s"
 #~ msgstr "felaktigt format angivet align:%s"
 
@@ -16948,9 +17153,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "no files added"
 #~ msgstr "inga filer har lagts till"
 
-#~ msgid "force creation (when already exists)"
-#~ msgstr "tvinga skapande (när den redan finns)"
-
 #~ msgid "slot"
 #~ msgstr "plats"
 
diff --git a/po/vi.po b/po/vi.po
index 9c9f99b4f..213ffc426 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,12 +6,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.14.0\n"
+"Project-Id-Version: git v2.15.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-25 07:06+0700\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-19 07:05+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-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 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)."
 
@@ -123,85 +123,85 @@ msgstr "không nhận ra tùy ch�n v� khoảng trắng “%s�"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "không nhận ra tùy ch�n b� qua khoảng trắng “%s�"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject và --3way không thể dùng cùng nhau."
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached và --3way không thể dùng cùng nhau."
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way ở ngoài một kho chứa"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index ở ngoài một kho chứa"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached ở ngoài một kho chứa"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 "Không thể chuẩn bị biểu thức chính qui dấu vết th�i gian (timestamp regexp) "
 "%s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "thi hành biểu thức chính quy trả v� %d cho đầu vào: %s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff sai - cần “/dev/null� trên dòng %d"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "chế độ không hợp lệ trên dòng %d: %s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "phần đầu mâu thuẫn dòng %d và %d"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "chi tiết: dòng không cần: %.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -213,81 +213,81 @@ msgstr[0] ""
 "phần đầu diff cho git  thiếu thông tin tên tập tin khi gỡ b� đi %d trong "
 "thành phần dẫn đầu tên của đư�ng dẫn (dòng %d)"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "tập tin mới phụ thuộc vào nội dung cũ"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "tập tin đã xóa vẫn còn nội dung"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "miếng vá h�ng tại dòng %d"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "tập tin đã xóa %s vẫn còn nội dung"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "miếng vá định dạng nhị phân sai h�ng tại dòng %d: %.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vá chỉ với “rác� tại dòng %d"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "không thể mở hay đ�c %s"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khởi đầu dòng: “%c�"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -296,446 +296,447 @@ msgstr ""
 "trong khi đang tìm kiếm cho:\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s�"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành "
 "“%s�"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "không thể áp dụng miếng vá nhị phân thành “%s� mà không có dòng chỉ mục đầy "
 "đủ"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "miếng vá áp dụng cho “%s� (%s), cái mà không khớp với các nội dung hiện tại."
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "miếng vá áp dụng cho một “%s� trống rỗng nhưng nó lại không trống"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "không thể đ�c postimage %s cần thiết cho “%s�"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s�"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "vá nhị phân cho “%s� tạo ra kết quả không chính xác (mong ch� %s, lại nhận "
 "%s)"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gặp lỗi khi vá: %s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "gặp lỗi khi đ�c %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "đ�c từ “%s� vượt ra ngoài liên kết m�m"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "đư�ng dẫn %s đã bị xóa hoặc đổi tên"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: không tồn tại trong bảng mục lục"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: không khớp trong mục lục"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob 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�."
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "�ang trở lại hòa trộn “3-đư�ng�…\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "không thể đ�c nội dung hiện hành của “%s�"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way�…\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "�ã áp dụng miếng vá %s với các xung đột.\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�ã áp dụng miếng vá %s một cách sạch sẽ.\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "loại b� miếng vá để lại nội dung tập tin"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "đư�ng dẫn không hợp lệ “%s�"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: đã có từ trước trong bảng mục lục"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: đã sẵn có trong thư mục đang làm việc"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "tập tin chịu tác động “%s� vượt ra ngoài liên kết m�m"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "�ang kiểm tra miếng vá %s…"
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 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:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, 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�"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "không thể thêm %s vào chỉ mục tạm th�i"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "không thểghi mục lục tạm vào %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "không thể gỡ b� %s từ mục lục"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miếng vá sai h�ng cho mô-đun-con %s"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "không thể lấy thống k� v� tập tin %s mới hơn đã được tạo"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "không thể tạo “kho lưu đằng sau� cho tập tin được tạo mới hơn %s"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "không thể thêm mục nhớ đệm cho %s"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gặp lỗi khi ghi vào “%s�"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s�"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "không thể ghi vào tập tin “%s� chế độ %o"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�ã áp dụng miếng vá %s một cách sạch sẽ."
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "lá»—i ná»™i bá»™"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "�ang áp dụng miếng vá %%s với %d lần từ chối…"
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 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:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s�"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khối nhớ #%d được áp dụng g�n gàng."
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "đoạn dữ liệu #%d bị từ chối."
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "b� qua đư�ng dẫn “%s�."
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "không thừa nhận đầu vào"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "không thể đ�c tập tin lưu bảng mục lục"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "không thể mở miếng vá “%s�: %s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d dòng thêm khoảng trắng lỗi."
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 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:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "đư�ng-dẫn"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "không áp dụng các thay đổi khớp với đư�ng dẫn đã cho"
 
-#: apply.c:4925
+#: apply.c:4951
 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:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "số"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "gỡ b� <số> dấu gạch chéo dẫn đầu từ đư�ng dẫn diff cổ điển"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "l� đi phần bổ xung được tạo ra bởi miếng vá"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
 
-#: apply.c:4947
+#: apply.c:4973
 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:4975
 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:4977
 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:4979
 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:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 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:4984
 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:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "hành động"
 
-#: apply.c:4960
+#: apply.c:4986
 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:4989 apply.c:4992
 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:4995
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: apply.c:4971
+#: apply.c:4997
 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:4999
 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:5001
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "chi tiết"
 
-#: apply.c:4978
+#: apply.c:5004
 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:5007
 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:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
@@ -758,108 +759,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "đặc tả đư�ng dẫn “%s� không khớp với bất kỳ tập tin nào"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "định_dạng"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "ti�n_tố"
 
-#: archive.c:420
+#: archive.c:438
 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:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "tập_tin"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "ghi kho lưu vào tập tin này"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "đ�c .gitattributes trong thư mục làm việc"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "chỉ lưu (không nén)"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "nén nhanh hơn"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "nén nh� hơn"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "kho"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "lệnh"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "đư�ng dẫn đến lệnh git-upload-pack trên máy chủ"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "Gặp tùy ch�n --remote không cần"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "Tùy ch�n --exec chỉ có thể được dùng cùng với --remote"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "Gặp tùy ch�n không cần --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Không hiểu định dạng “%s�"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Tham số không được hỗ trợ cho định dạng “%s�: -%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s không phải tên thuộc tính hợp lệ"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -937,31 +938,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:849
+#: 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:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s�"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đ�c tập tin “%s�"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "việc đ�c tham chiếu bisect gặp lỗi"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s là cả %s và %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -970,7 +971,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:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -979,7 +980,7 @@ msgstr[0] "(ước chừng %d bước)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -998,10 +999,10 @@ 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:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 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"
 
@@ -1042,44 +1043,46 @@ msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Nhánh “%s� cài đặt để theo dõi nhánh máy chủ “%s� từ “%s� bằng cách rebase."
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Nhánh “%s� cài đặt để theo dõi nhánh máy chủ “%s� từ “%s�."
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s bằng cách rebase."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "Nhánh “%s� cài đặt để theo dõi nhánh nội bộ “%s� bằng cách rebase."
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh nội bộ %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Nhánh “%s� cài đặt để theo dõi nhánh nội bộ “%s�."
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Nhánh “%s� cài đặt để theo dõi tham chiếu máy chủ “%s� bằng cách rebase."
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Nhánh %s cài đặt để theo dõi tham chiếu máy chủ %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Nhánh “%s� cài đặt để theo dõi tham chiếu máy chủ “%s�."
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
-"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase."
+"Nhánh “%s� cài đặt để theo dõi tham chiếu nội bộ “%s� bằng cách rebase."
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Nhánh %s cài đặt để theo dõi tham chiếu nội bộ %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Nhánh “%s� cài đặt để theo dõi tham chiếu nội bộ “%s�."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1100,23 +1103,23 @@ msgstr "“%s� không phải là một tên nhánh hợp lệ."
 msgid "A branch named '%s' already exists."
 msgstr "�ã có nhánh mang tên “%s�."
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s� không phải là một "
 "nhánh."
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "nhánh thượng nguồn đã yêu cầu “%s� không tồn tại"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1136,22 +1139,22 @@ msgstr ""
 "sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
 "\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Không phải tên đối tượng hợp lệ: “%s�."
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Tên đối tượng chưa rõ ràng: “%s�."
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Nhánh không hợp lệ: “%s�."
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "“%s� đã được lấy ra tại “%s� rồi"
@@ -1171,7 +1174,9 @@ 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:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "không thể mở “%s�"
@@ -1180,54 +1185,54 @@ msgstr "không thể mở “%s�"
 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:186
+#: bundle.c:193
 #, 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:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
 
-#: bundle.c:195
+#: bundle.c:202
 #, 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:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "Không thể sản sinh đối tượng gói"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "đối tượng gói đã chết"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "rev-list đã chết"
 
-#: bundle.c:356
+#: bundle.c:363
 #, 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:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "đối số không được thừa nhận: %s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
@@ -1236,8 +1241,8 @@ msgstr "mục lục gói đã chết"
 msgid "invalid color value: %.*s"
 msgstr "giá trị màu không hợp lệ: %.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "không thể phân tích cú pháp %s"
@@ -1247,7 +1252,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:1511
+#: commit.c:1517
 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"
@@ -1261,155 +1266,155 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "hết bộ nhớ"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "các đi�u kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "cấu hình sai tại dòng %d trong tập tin %s"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "cấu hình sai tại dòng %d trong %s"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "nằm ngoài phạm vi"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "đơn vị không hợp lệ"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s�: %s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong blob %s: %s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong tập tin %s: %s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "sai giá trị bằng số của cấu hình “%s� cho “%s� trong đầu vào tiêu chuẩn: %s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "sai giá trị bằng số của cấu hình “%s� cho “%s� trong submodule-blob %s: %s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong dòng lệnh %s: %s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong %s: %s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "gặp lỗi mở rộng thư mục ngư�i dùng trong: “%s�"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mức nén zlib %d là sai"
 
-#: config.c:1212
+#: config.c:1213
 #, 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:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mức nén gói %d không hợp lệ"
 
-#: config.c:1564
+#: config.c:1568
 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:1894
+#: config.c:1900
 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:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s không hợp lệ: “%s�"
 
-#: config.c:2085
+#: config.c:2130
 #, 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:2111
+#: config.c:2156
 #, 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:2122
+#: config.c:2167
 #, 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:2124
+#: config.c:2169
 #, 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:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trên %s gặp lỗi"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "không thể đặt “%s� thành “%s�"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "không thể thôi đặt “%s�"
@@ -1430,19 +1435,19 @@ 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:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "�ang kiểm tra kết nối"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "Không thể chạy “git rev-list�"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "gặp lỗi khi ghi vào rev-list"
 
-#: connected.c:102
+#: connected.c:103
 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"
 
@@ -1542,27 +1547,35 @@ msgstr "gặp lỗi khi đ�c tập-tin-thứ-tự “%s�"
 msgid "Performing inexact rename detection"
 msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "tùy ch�n “%s� yêu cầu một giá trị"
 
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Gặp lỗi khi phân tích dirstat cắt b� phần trăm “%s�\n"
 
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Không hiểu đối số dirstat “%s�\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"cài đặt màu đã di chuyển phải là một trong “no�, “default�, “zebra�, "
+"“dimmed_zebra�, “plain�"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule�: “%s�"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1571,20 +1584,20 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, 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:3427
+#: diff.c:4189
 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:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cần chính xác một đặc tả đư�ng dẫn"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1593,22 +1606,22 @@ msgstr ""
 "Gặp lỗi khi phân tích đối số tùy ch�n --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, 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:4716
+#: diff.c:5505
 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:4719
+#: diff.c:5508
 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:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1616,207 +1629,211 @@ 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:1948
+#: dir.c:1983
 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:2067
+#: dir.c:2102
 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:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "không thể tạo thư mục cho %s"
 
-#: dir.c:2876
+#: dir.c:2915
 #, 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�"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Nội dung l�c"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "không thể lấy thống kê tập tin “%s�"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cần danh sách shallow"
 
-#: fetch-pack.c:263
+#: 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:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "lỗi máy chủ: %s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, 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:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc cần multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "dòng shallow không hợp lệ: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "dòng unshallow không hợp lệ: %s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "Không tìm thấy đối tượng: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "lỗi trong đối tượng: %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "không tìm shallow nào: %s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhận %s %d - %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "lần chuyển giao %s không hợp lệ"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhận %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "�ánh dấu %s là đã hoàn thành"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "đã sẵn có %s (%s)"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "lỗi giao thức: phần đầu gói bị sai"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: không thể rẽ nhánh %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s gặp lỗi"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "có lỗi trong sideband demultiplexer"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "Máy chủ không hỗ trợ máy khách shallow"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "Máy chủ hỗ trợ multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "Máy chủ hỗ trợ no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "Máy chủ hỗ trợ multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "Máy chủ hỗ trợ side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "Máy chủ hỗ trợ side-band"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "Máy chủ hỗ trợ ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiên bản máy chủ là %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "Máy chủ không hỗ trợ --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "Máy chủ không hỗ trợ --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "Máy chủ không hỗ trợ --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "không có lần chuyển giao chung nào"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch gặp lỗi."
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "không khớp phần đầu máy chủ"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, 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:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
@@ -1830,7 +1847,7 @@ msgstr "gpg gặp lỗi khi ký dữ liệu"
 msgid "could not create temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�"
@@ -1840,17 +1857,17 @@ 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:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 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:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "“%s�: đ�c ngắn"
@@ -1986,12 +2003,12 @@ 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:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngày tháng không hợp lệ: %s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2010,7 +2027,7 @@ msgstr ""
 "một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
 "gõ b� tập tin một cách thủ công để tiếp tục."
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Không thể tạo “%s.lock�: %s"
@@ -2019,78 +2036,78 @@ 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:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 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"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "(commit sai)\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "addinfo_cache gặp lỗi đối với đư�ng dẫn “%s�"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "gặp lỗi khi xây dựng cây"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, 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:739
+#: merge-recursive.c:763
 #, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr ": có lẽ là một xung đột D/F?"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, 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:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 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:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "đối tượng blob được mong đợi cho %s “%s�"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "gặp lỗi khi mở “%s�: %s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, 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:846
+#: merge-recursive.c:870
 #, 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:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, 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:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2099,7 +2116,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:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2108,7 +2125,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:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2117,7 +2134,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:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2126,20 +2143,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:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "đổi tên"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "đã đổi tên"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, 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:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2148,140 +2165,140 @@ 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:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr " (cần giải quyết)"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, 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:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "Thêm hòa trộn %s"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Thay vào đó thêm vào %s"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "không thể đ�c đối tượng %s"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, 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:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "sửa đổi"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "đã sửa"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "ná»™i dung"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "thêm/thêm"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, 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:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Tự-động-hòa-trộn %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "mô-đun-con"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "�ang xóa %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "tập-tin/thư-mục"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "thư-mục/tập-tin"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "Thêm \"%s\""
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "�ã cập nhật rồi!"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, 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:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "�ang trộn:"
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, 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:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "hòa trộn không trả v� lần chuyển giao nào"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "Không thể ghi bảng mục lục"
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2293,7 +2310,7 @@ msgstr ""
 "chuyển giao hay bãi b� lần hòa trộn trước đây và bắt đầu một hòa trộn ghi "
 "chú mới."
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 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)."
@@ -2323,16 +2340,31 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Giá trị %s sai: “%s�"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "không thể phân tích đối tượng: “%s�"
 
+#: packfile.c:556
+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
+#, 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
+#, 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
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
@@ -2340,17 +2372,17 @@ msgstr "cách dùng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
 
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-S�"
 
@@ -2359,7 +2391,7 @@ msgstr "-S�"
 msgid "malformed object name '%s'"
 msgstr "tên đối tượng dị hình “%s�"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Không thể làm %s được ghi bởi nhóm"
@@ -2434,7 +2466,7 @@ msgstr "“%s� (mnemonic: “%c�)"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: số mầu nhiệm đặc tả đư�ng dẫn chưa được hỗ trợ bởi lệnh này: %s"
 
-#: pathspec.c:575
+#: 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"
@@ -2442,12 +2474,12 @@ msgstr ""
 "chuỗi rỗng làm đặc tả đư�ng dẫn không hợp lệ ở lần phát hành kế tiếp. Vui "
 "lòng dùng . để thay thế nếu ý bạn là khớp m�i đư�ng dẫn"
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "đặc tả đư�ng dẫn “%s� vượt ra ngoài liên kết m�m"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "không thể phân tích định dạng --pretty"
 
@@ -2469,50 +2501,51 @@ 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:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "không thể đóng “%s�"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "không thể mở thư mục git: %s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "không thể b� liên kết (unlink): “%s�"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Không thể mở “%s� để ghi"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "cập nhật tham chiếu bị cấm trong môi trư�ng kiểm tra"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "không thể gỡ b� tham chiếu: %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, 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:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "không thể xóa b� tham chiếu: %s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "không thể gỡ b� tham chiếu: %s"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "đã ra đi"
@@ -2542,147 +2575,147 @@ msgstr "cần định dạng: %%(color:<color>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "không nhận ra màu: %%(màu:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "đối số không được thừa nhận %%(%s): %s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) không nhận các đối số"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) không nhận các đối số"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) không nhận các đối số"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "không hiểu tham số %%(trailers): %s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "cần nội dung mang giá trị dương:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "đối số không được thừa nhận %%(contents): %s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "cần nội dung mang giá trị dương:shot=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "đối số không được thừa nhận %%(objectname): %s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "cần định dạng: %%(align:<width>,<position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "vị trí không được thừa nhận:%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "chi�u rộng không được thừa nhận:%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "đối số không được thừa nhận %%(align): %s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "đối số không được thừa nhận %%(if): %s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "tên trư�ng dị hình: %.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "không hiểu tên trư�ng: %.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "định dạng: nguyên tử %%(then) được dùng nhi�u hơn một lần"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "định dạng: nguyên tử %%(else) được dùng nhi�u hơn một lần"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "chuỗi định dạng dị hình %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(không nhánh, đang cải tổ %s)"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
@@ -2690,7 +2723,7 @@ msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD được tách r�i tại %s)"
@@ -2698,109 +2731,109 @@ msgstr "(HEAD được tách r�i tại %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD được tách r�i từ %s)"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(không nhánh)"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "thiếu đối tượng %s cho %s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, 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:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "đối tượng dị hình tại “%s�"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, 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:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "đang l� đi tham chiếu h�ng %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "định dạng: thiếu nguyên tử %%(end)"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: remote.c:747
+#: remote.c:750
 #, 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:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thư�ng theo dõi %s, không phải %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dõi cả %s và %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD không chỉ đến một nhánh nào cả"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "không có nhánh nào như thế: “%s�"
 
-#: remote.c:1692
+#: remote.c:1693
 #, 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:1698
+#: remote.c:1699
 #, 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:1713
+#: remote.c:1714
 #, 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:1725
+#: remote.c:1726
 #, 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:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "đẩy refspecs cho “%s� không bao gồm “%s�"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "đẩy lên mà không có đích (push.default là “nothing�)"
 
-#: remote.c:1771
+#: remote.c:1772
 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"
 
@@ -2816,7 +2849,7 @@ msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+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:2087
@@ -2861,16 +2894,16 @@ 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:2187
+#: revision.c:2256
 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:2190
+#: revision.c:2259
 #, 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:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent xung khắc với --bisect"
 
@@ -2912,24 +2945,24 @@ msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
 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:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "hoàn nguyên"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Không nhận ra thao tác: %d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2937,7 +2970,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:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2947,42 +2980,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:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "không thể khóa “%s�"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "không thể ghi vào “%s�"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "không thể ghi eol vào “%s�"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "gặp lỗi khi finalize “%s�"
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "Không thể đ�c “%s�."
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, 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:360
+#: sequencer.c:362
 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:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: chuyển-tiếp-nhanh"
@@ -2990,20 +3024,20 @@ msgstr "%s: chuyển-tiếp-nhanh"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, 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:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "không thể phân giải lần chuyển giao HEAD\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "không thể cập nhật cây bộ nhớ đệm\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3032,17 +3066,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "không thể phân tích lần chuyển giao %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "không thể phân tích lần chuyển giao cha mẹ “%s�\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3053,7 +3087,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3064,233 +3098,234 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, 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:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "cần một HEAD để sửa"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "không thể đ�c phần chú thích (message) của HEAD"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "không thể ghi “%s�"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "�ây là chú thích cho lần chuyển giao thứ nhất:"
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, 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:879
+#: sequencer.c:881
 #, 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:884
+#: sequencer.c:886
 #, 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:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 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:973
+#: sequencer.c:975
 #, 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:981
+#: sequencer.c:983
 #, 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:985
+#: sequencer.c:987
 #, 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:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, 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:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "không thể đổi tên “%s� thành “%s�"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "không thể hoàn nguyên %s… %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "không thể áp dụng miếng vá %s… %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, 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:1186
+#: sequencer.c:1188
 #, 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:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dòng không hợp lệ %d: %.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, 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:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "không thể đ�c “%s�."
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 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:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bảng chỉ thị không thể dùng được: %s"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "không có lần chuyển giao nào được phân tích."
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "không thể cherry-pick trong khi hoàn nguyên."
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 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:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "khóa không đúng: %s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giá trị cho %s không hợp lệ: %s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bảng tùy ch�n dị hình: “%s�"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 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:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, 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:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "không thể khóa HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 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:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "không mở được “%s�"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "không thể đ�c “%s�: %s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, 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:1658
+#: sequencer.c:1677
 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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "không thể đ�c bảng mục lục"
 
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3305,11 +3340,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 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:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3326,17 +3361,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�ã áp dụng autostash.\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "không thử lưu “%s�"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3348,57 +3383,57 @@ 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:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dừng lại ở %s…  %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "không thể đ�c orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "không thể đ�c “onto�."
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "không thể cập nhật %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "không thể cập nhật HEAD thành %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 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:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "không thể xóa b� CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 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:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tập tin không hợp lệ: “%s�"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nội dung không hợp lệ: “%s�"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3408,24 +3443,112 @@ 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:2228
+#: sequencer.c:2251
 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:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: không thể cherry-pick một %s"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 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:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: các tùy ch�n được không xử lý"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "danh sách cần làm không dùng được: “%s�"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "không thể mở “%s� để ghi"
+
+#: sequencer.c:2561
+#, 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:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+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:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"�ể tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa b� một lần "
+"chuyển giao.\n"
+"\n"
+"Dùng “git config rebase.missingCommitsCheck� để thay đổi mức độ của cảnh "
+"báo.\n"
+"Cánh ứng xử có thể là: ignore, warn, error.\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"Bạn có thể sửa nó bằng “git rebase --edit-todo� và sau đó chạy “git rebase --"
+"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:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "không thể phân tích lần chuyển giao “%s�"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "không thể mở “%s� để ghi"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "không thể cắt cụt “%s�"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "văn lệnh đã sẵn được sắp đặt rồi."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "không thể hoàn thành “%s�"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3459,34 +3582,34 @@ 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:504
+#: setup.c:499
 #, 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:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "tìm thấy phần mở rộng kho chưa biết:"
 
-#: setup.c:810
+#: setup.c:806
 #, 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:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "Không thể quay lại cwd"
 
-#: setup.c:1050
+#: setup.c:1046
 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:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Không thể chuyển sang “%s�"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3496,7 +3619,7 @@ msgstr ""
 "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
 "đặt)."
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3505,56 +3628,41 @@ msgstr ""
 "Gặp vấn đ� với gía 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:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "đư�ng dẫn “%s� không tồn tại"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, 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:592
+#: sha1_file.c:560
 #, 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:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiếu “%s� là nông"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "kho tham chiếu “%s� bị cấy ghép"
 
-#: sha1_file.c:1245
-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 à?)"
-
-#: sha1_file.c:2729
-#, 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 à?)"
-
-#: sha1_file.c:2733
-#, 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 à?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "tóm lược SHA1 %s chưa rõ ràng"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "Các ứng cử là:"
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3578,66 +3686,72 @@ msgstr ""
 "này\n"
 "bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
 "trÆ°á»›c"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đư�ng_dẫn=%s"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Không thể cập nhật mục .gitmodules %s"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Không thể gỡ b� mục .gitmodules dành cho %s"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "Trong mô-đun-con không có gì “%s�"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "�ặc tả đư�ng dẫn “%s� thì ở trong mô-đun-con “%.*s�"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+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:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+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ệ."
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "không nhận ra “%s� là một kho git"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "không thể lấy thống kê “git status� trong mô-đun-con “%s�"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "không thể chạy “git status� trong mô-đun-con “%s�"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "mô-đun-con “%s� có mục lục còn bẩn"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3645,18 +3759,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:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, 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:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "không thể tạo thư mục “%s�"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3667,94 +3781,98 @@ msgstr ""
 "“%s� sang\n"
 "“%s�\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "không thể đệ quy vào trong mô-đun-con “%s�"
 
-#: submodule.c:1992
+#: submodule.c:1956
 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:2012
+#: submodule.c:1976
 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:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree trả v� mã không như mong đợi %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "giá trị cho %s không hợp lệ"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "chạy lệnh kéo theo “%s� gặp lỗi"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "không hiểu giá trị “%s� cho khóa “%s�"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "nhi�u hơn một %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s�"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "không đ�c được tập tin đầu vào “%s�"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "không thể đ�c từ đầu vào tiêu chuẩn"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "không thể lấy thông tin thống kê v� %s"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "\"%s\" không phải là tập tin bình thư�ng"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "tập tin %s ngư�i dùng không thể ghi được"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "không thể đổi tên tập tin tạm th�i thành %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Không thể đặt thượng nguồn của “%s� thành “%s� của “%s�\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 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:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3763,7 +3881,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:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3790,7 +3908,7 @@ msgstr ""
 "để đẩy chúng lên máy phục vụ.\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "Bãi b�."
 
@@ -3811,11 +3929,11 @@ msgstr "chế độ dị hình trong đ� mục cây"
 msgid "empty filename in tree entry"
 msgstr "tên tập tin trống rỗng trong mục tin cây"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "tập tin cây quá ngắn"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3826,7 +3944,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:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3836,7 +3954,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3847,7 +3965,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:112
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3857,7 +3975,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3867,7 +3985,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:117
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3877,7 +3995,7 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3887,7 +4005,7 @@ msgstr ""
 "trong nó:\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3897,7 +4015,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:128
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3907,7 +4025,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3917,7 +4035,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:133
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3927,7 +4045,7 @@ msgstr ""
 "trá»™n:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3936,7 +4054,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:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3945,7 +4063,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:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3956,7 +4074,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:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3967,7 +4085,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3977,7 +4095,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:150
+#: unpack-trees.c:151
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3987,7 +4105,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3997,7 +4115,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạ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"
@@ -4007,21 +4125,21 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, 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:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 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:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4032,7 +4150,7 @@ msgstr ""
 "nhật checkout rải rác:\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4043,7 +4161,7 @@ msgstr ""
 "nhật checkout rải rác:\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4052,17 +4170,12 @@ msgstr ""
 "Không thể cập nhật mô-đun-con:\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "Bãi b�\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s�"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "�ang lấy ra các tập tin"
 
@@ -4105,13 +4218,8 @@ msgstr "gặp lỗi khi đ�c “%s�"
 msgid "could not open '%s' for reading and writing"
 msgstr "không thể mở “%s� để đ�c và ghi"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "không thể mở “%s� để ghi"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "không thể mở “%s� để đ�c"
@@ -4135,200 +4243,200 @@ msgstr "không thể ghi vào %s"
 msgid "could not close %s"
 msgstr "không thể đóng %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "Những đư�ng dẫn chưa được hòa trộn:"
 
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, 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:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 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:185
+#: wt-status.c:183
 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:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 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:189
+#: wt-status.c:187
 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:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "Những thay đổi sẽ được chuyển giao:"
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 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:222
+#: wt-status.c:220
 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:224
+#: wt-status.c:222
 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:225
+#: wt-status.c:223
 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:227
+#: wt-status.c:225
 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:239
+#: wt-status.c:237
 #, 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:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "bị xóa bởi cả hai:"
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "được thêm vào bởi chúng ta:"
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "bị xóa đi bởi h�:"
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "được thêm vào bởi h�:"
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "bị xóa bởi chúng ta:"
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "được thêm vào bởi cả hai:"
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "bị sửa bởi cả hai:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "tập tin mới:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "đã chép:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "đã xóa:"
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "đã sửa:"
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "đã đổi tên:"
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "đổi-kiểu:"
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "không hiểu:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "chưa hòa trộn:"
 
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "lần chuyển giao mới, "
 
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "nội dung bị sửa đổi, "
 
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "nội dung chưa được theo dõi, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 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:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"Không động đến đư�ng ở trên.\n"
+"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:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "Bạn có những đư�ng dẫn chưa được hòa trộn."
 
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
 
-#: wt-status.c:1054
+#: wt-status.c:1053
 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:1059
+#: wt-status.c:1058
 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:1062
+#: wt-status.c:1061
 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:1072
+#: wt-status.c:1071
 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:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "Miếng vá hiện tại bị trống rỗng."
 
-#: wt-status.c:1079
+#: wt-status.c:1078
 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:1081
+#: wt-status.c:1080
 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:1083
+#: wt-status.c:1082
 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)"
 
@@ -4638,7 +4746,7 @@ 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:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
@@ -4652,7 +4760,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:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "Cập nhật tập tin gặp lỗi"
 
@@ -4661,115 +4769,115 @@ msgstr "Cập nhật tập tin gặp lỗi"
 msgid "remove '%s'\n"
 msgstr "gỡ b� “%s�\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "�ưa ra kh�i bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "Không thể đ�c bảng mục lục"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Không thể mở “%s� để ghi."
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "Không thể ghi ra miếng vá"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "gặp lỗi khi sửa miếng vá"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Không thể lấy thông tin thống kê v� “%s�"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "Miếng vá trống rỗng. Nên b� qua."
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Không thể áp dụng miếng vá “%s�"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "chạy thử"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "ch�n “hunks� theo kiểu tương tác"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "sửa diff hiện nay và áp dụng nó"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "cho phép thêm các tập tin bị b� qua khác"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "cập nhật các tập tin được theo dõi"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "chỉ ghi lại sự việc mà đư�ng dẫn sẽ được thêm vào sau"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
 "vết"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "l� đi các đư�ng dẫn bị gỡ b� trong cây thư mục làm việc (giống với --no-all)"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr "chie b� qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "kiểm tra xem - thậm chí thiếu - tập tin bị b� qua trong quá trình chạy thử"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "cảnh báo khi thêm một kho nhúng"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4800,151 +4908,151 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" để biết thêm chi tiết."
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "thêm cần một kho git nhúng: %s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Sử dụng tùy ch�n -f nếu bạn thực sự muốn thêm chúng vào.\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "thêm tập tin gặp lỗi"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A và -u xung khắc nhau"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Tùy ch�n --ignore-missing chỉ có thể được dùng cùng với --dry-run"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod tham số “%s� phải hoặc là -x hay +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 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:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "tập tin ghi bảng mục lục bị h�ng"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "không thể phân tích cú pháp văn lệnh tác giả"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "“%s� bị xóa bởi móc applypatch-msg"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dòng đầu vào dị hình: “%s�."
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s� tới “%s�"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "không thể phân tích cú pháp “%s�"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "dấu th�i gian không hợp lệ"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "dòng Ngày tháng không hợp lệ"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "độ lệch múi gi� không hợp lệ"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nh� các miếng vá."
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, 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:1172
+#: builtin/am.c:1194
 #, 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:1173
+#: builtin/am.c:1195
 #, 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:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "Miếng vá trống rỗng."
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "dòng thụt l� không hợp lệ: %.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, 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:1586
+#: builtin/am.c:1584
 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:1588
+#: builtin/am.c:1586
 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:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4952,38 +5060,38 @@ 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:1613
+#: builtin/am.c:1611
 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:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 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:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, 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:1735
+#: builtin/am.c:1733
 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:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -4991,37 +5099,37 @@ 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:1750
+#: builtin/am.c:1748
 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:1800
+#: builtin/am.c:1798
 #, 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:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�p dụng: %.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 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:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, 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:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5032,7 +5140,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:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5045,17 +5153,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:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "không thể phân tích đối tượng “%s�."
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "gặp lỗi khi d�n bảng mục lục"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5063,135 +5171,134 @@ 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:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giá trị không hợp lệ cho --patch-format: %s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các-tùy-ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các-tùy-ch�n>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "tùy ch�n lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 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:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "im lặng"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 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:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 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:2241
+#: builtin/am.c:2240
 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:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "cắt m�i thứ trước dòng scissors"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "chuyển nó qua git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "định dạng"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 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:2278
+#: builtin/am.c:2277
 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:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 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:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "nói dối v� ngày chuyển giao"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 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:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "mã-số-khóa"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5199,16 +5306,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:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, 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:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5217,7 +5324,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:2369
+#: builtin/am.c:2368
 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."
 
@@ -5422,14 +5529,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<các-tùy-ch�n>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<các-tùy-ch�n>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<các-tùy-ch�n>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<các-tùy-ch�n>] [-r | -a] [--format]"
 
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5438,7 +5549,7 @@ msgstr ""
 "đang xóa nhánh “%s� mà nó lại đã được hòa trộn vào\n"
 "         “%s�, nhưng vẫn chưa được hòa trộn vào HEAD."
 
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5447,12 +5558,12 @@ msgstr ""
 "không xóa nhánh “%s� cái mà chưa được hòa trộn vào\n"
 "         “%s�, cho dù là nó đã được hòa trộn vào HEAD."
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s�"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5461,91 +5572,112 @@ msgstr ""
 "Nhánh “%s� không được trộn một cách đầy đủ.\n"
 "Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s�."
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
 msgstr "Cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "không thể dùng tùy ch�n -a với -d"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Không thể xóa nhánh “%s� đã được lấy ra tại “%s�"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "không tìm thấy nhánh theo dõi máy chủ “%s�."
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "không tìm thấy nhánh “%s�."
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s�"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Gặp lỗi khi xóa b� nhánh “%s�"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "�ã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Nhánh “%s� đã bị xóa (từng là %s)\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "không thể phân tích chuỗi định dạng"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Nhánh %s đang được cải tổ lại tại %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Tên nhánh không hợp lệ: “%s�"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Gặp lỗi khi sao chép nhánh"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "�ã chép nhánh khuyết danh “%s� đi"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�ã đổi tên nhánh khuyết danh “%s� đi"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
+
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5556,176 +5688,184 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được cắt b�.\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "hiển thị mã băm và chủ đ�, đưa ra hai lần cho nhánh thượng nguồn"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "thay đổi thông tin thượng nguồn"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "không dùng"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "thượng nguồn"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "B� đặt thông tin thượng nguồn"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking�"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "liệt kê cả nhánh “remote-tracking� và nội bộ"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "xóa một toàn bộ nhánh đã hòa trộn"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "sao chép một nhánh và reflog của nó"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "buộc tạo, di chuyển/đổi tên, xóa"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "khóa"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "đối tượng"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 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:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: 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:615
-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ệ."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "không tìm thấy HEAD ở dưới refs/heads!"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "tùy ch�n --column và --verbose xung khắc nhau"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "cần chỉ ra tên nhánh"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "Không thể đưa ra mô tả HEAD đã tách r�i"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "không thể sửa mô tả cho nhi�u hơn một nhánh"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Vẫn chưa chuyển giao trên nhánh “%s�."
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Không có nhánh nào có tên “%s�."
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "quá nhi�u nhánh dành cho thao tác đổi tên"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "quá nhi�u nhánh dành cho thao tác sao chép"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "quá nhi�u nhánh được đặt cho thượng nguồn mới"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "quá nhi�u tham số cho thao tác đổi tên"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "quá nhi�u tham số để đặt thượng nguồn mới"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5733,58 +5873,46 @@ msgstr ""
 "không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
 "nào cả."
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "không có nhánh nào như thế “%s�"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s�"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "quá nhi�u nhánh để b� đặt thượng nguồn"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "quá nhi�u tham số để b� đặt thượng nguồn"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "không thể b� đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Nhánh “%s� không có thông tin thượng nguồn"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "không hợp lý khi tạo “HEAD� thủ công"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "hai tùy ch�n -a và -r áp dụng cho lệnh “git branch� không hợp lý đối với tên "
 "nhánh"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"C� --set-upstream đã lạc hậu và sẽ bị xóa b�. Nên dùng --track hoặc --set-"
-"upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Nếu bạn muốn “%s� theo dõi “%s�, thực hiện lệnh sau:\n"
-"\n"
+"tùy ch�n --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--"
+"track� hoặc “--set-upstream-to� để thay thế."
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5799,7 +5927,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:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5807,7 +5935,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:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5815,64 +5943,64 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 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:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "hiển thị kiểu đối tượng"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "hiển thị kích thước đối tượng"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 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:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "in nội dung đối tượng dạng dễ đ�c"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 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:566
+#: builtin/cat-file.c:568
 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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 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:570
+#: builtin/cat-file.c:572
 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:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "đệm kết xuất --batch"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 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:576
+#: builtin/cat-file.c:578
 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:579
+#: builtin/cat-file.c:581
 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:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "hiển thị m�i đối tượng với --batch hay --batch-check"
 
@@ -5900,7 +6028,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:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
@@ -5991,9 +6119,9 @@ msgid "write the content to temporary files"
 msgstr "ghi nội dung vào tập tin tạm"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "chuá»—i"
 
@@ -6065,54 +6193,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr "đư�ng dẫn “%s� không được hòa trộn"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 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:628
+#: builtin/checkout.c:632
 #, 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:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, 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:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "�ã chuyển đến nhánh mới “%s�\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6131,7 +6259,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6152,164 +6280,164 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 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:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 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:976
+#: builtin/checkout.c:987
 #, 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:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, 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:1084
+#: builtin/checkout.c:1095
 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:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, 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:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "“%s� không thể được dùng với “%s�"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, 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:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "nhánh"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "r�i b� HEAD tại lần chuyển giao theo tên"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "đặt thông tin thượng nguồn cho nhánh mới"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 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:1155
+#: builtin/checkout.c:1165
 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:1157
+#: builtin/checkout.c:1167
 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:1158
+#: builtin/checkout.c:1168
 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:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị b� qua (mặc định)"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 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:1166
+#: builtin/checkout.c:1176
 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:1168
+#: builtin/checkout.c:1178
 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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "ép buộc báo cáo tiến triển công việc"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 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:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "Thiếu tên nhánh; hãy thử -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, 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:1272
+#: builtin/checkout.c:1281
 #, 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:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6348,7 +6476,7 @@ msgstr "Nên b� qua kho chứa %s\n"
 msgid "failed to remove %s"
 msgstr "gặp lỗi khi gỡ b� %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6361,7 +6489,7 @@ msgstr ""
 "foo        - ch�n mục trên cơ sở ti�n tố duy nhất\n"
 "           - (để trống) không ch�n gì cả\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6382,38 +6510,38 @@ msgstr ""
 "*          - ch�n tất\n"
 "           - (để trống) kết thúc việc ch�n\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hả (%s)?\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Mẫu để l�c các tập tin đầu vào cần l� đi>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "CẢNH B�O: Không tìm thấy các mục được khớp bởi: %s"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "Ch�n mục muốn xóa"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xóa b� “%s� [y/N]? "
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Tạm biệt.\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6431,62 +6559,62 @@ 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:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Lệnh ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Gi� thì sao"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Có muốn gỡ b� (các) mục sau đây không:"
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "Không còn tập-tin nào để d�n dẹp, đang thoát ra."
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "không hiển thị tên của các tập tin đã gỡ b�"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "ép buộc"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "d�n bằng kiểu tương tác"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "mẫu"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "thêm <mẫu> vào trong qui tắc b� qua"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "đồng th�i gỡ b� cả các tập tin bị b� qua"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "chỉ gỡ b� những tập tin bị b� qua"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x và -X không thể dùng cùng nhau"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6494,7 +6622,7 @@ msgstr ""
 "clean.requireForce được đặt thành 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/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6502,144 +6630,144 @@ 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:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<các-tùy-ch�n>] [--] <kho> [<t.mục>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "tạo kho bản sao (ý là kho thuần)"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "để nhân bản từ kho nội bộ"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 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:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "cài đặt đây là kho chia sẻ"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "đặc-tả-đư�ng-dẫn"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "khởi tạo mô-đun-con trong bản sao"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 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:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 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:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "kho tham chiếu"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "tên"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 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:114
+#: builtin/clone.c:115
 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:116
+#: builtin/clone.c:117
 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:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "độ-sâu"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 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:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "th�i-gian"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 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:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "điểm xét duyệt"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 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:124
+#: builtin/clone.c:125
 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:126
+#: builtin/clone.c:127
 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:128
+#: builtin/clone.c:129
 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:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 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:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "khóa=giá_trị"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 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:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6647,42 +6775,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:325
+#: builtin/clone.c:326
 #, 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:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, 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:419
+#: builtin/clone.c:420
 #, 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:441
+#: builtin/clone.c:442
 #, 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:445
+#: builtin/clone.c:446
 #, 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:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6692,99 +6820,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:559
+#: builtin/clone.c:560
 #, 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:654
+#: builtin/clone.c:655
 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:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 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:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 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:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để d�n dẹp"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 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:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 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:907
+#: builtin/clone.c:911
 #, 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:910
+#: builtin/clone.c:914
 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:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s� chưa tồn tại"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, 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:939
+#: builtin/clone.c:943
 #, 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:949
+#: builtin/clone.c:953
 #, 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:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, 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:967
+#: builtin/clone.c:971
 #, 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:979
+#: builtin/clone.c:983
 #, 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:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "�ang nhân bản thành “%s�…\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6792,41 +6920,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:1067
+#: builtin/clone.c:1071
 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:1069
+#: builtin/clone.c:1073
 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:1071
+#: builtin/clone.c:1075
 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:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên b� qua --local"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local bị l� đi"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Không biết làm cách nào để nhân bản (clone) %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, 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:1149
+#: builtin/clone.c:1153
 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."
 
@@ -6977,63 +7105,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:319
+#: builtin/commit.c:318
 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:360
+#: builtin/commit.c:359
 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:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 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:381
+#: builtin/commit.c:380
 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:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 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:459
+#: builtin/commit.c:461
 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:461
+#: builtin/commit.c:463
 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:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "không đ�c được bảng mục lục"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 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:583
+#: builtin/commit.c:587
 #, 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:585
+#: builtin/commit.c:589
 #, 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:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7041,38 +7169,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:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, 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:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 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:707
+#: builtin/commit.c:711
 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:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đ�c được tệp nhật ký “%s�"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đ�c SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "không thể đ�c MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7087,7 +7215,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7102,7 +7230,7 @@ msgstr ""
 "\t%s\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7113,7 +7241,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:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7125,155 +7253,155 @@ 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:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgư�i chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "Không đ�c được bảng mục lục"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, 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:1068
+#: builtin/commit.c:1075
 #, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, 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:1121
+#: builtin/commit.c:1128
 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:1151
+#: builtin/commit.c:1158
 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:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 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:1165
+#: builtin/commit.c:1172
 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:1168
+#: builtin/commit.c:1175
 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:1178
+#: builtin/commit.c:1185
 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:1180
+#: builtin/commit.c:1187
 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:1188
+#: builtin/commit.c:1195
 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:1205
+#: builtin/commit.c:1212
 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:1207
+#: builtin/commit.c:1214
 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:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chế độ d�n dẹp không hợp lệ %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 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:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "hiển thị trạng thái ở dạng súc tích"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "hiển thị thông tin v� tạm cất"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "kết xuất dạng máy-có-thể-đ�c"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 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:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "chấm dứt các mục bằng NUL"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "chế độ"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 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:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "hiển thị các tập tin ẩn"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7281,205 +7409,206 @@ 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:1364
+#: builtin/commit.c:1371
 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:1440
+#: builtin/commit.c:1449
 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:1442
+#: builtin/commit.c:1451
 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:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "đã r�i kh�i HEAD"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 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:1588
+#: builtin/commit.c:1597
 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:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "đ�c chú thích từ tập tin"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "chú thích"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 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:1596
+#: builtin/commit.c:1605
 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:1597
+#: builtin/commit.c:1606
 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:1598
+#: builtin/commit.c:1607
 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:1599
+#: builtin/commit.c:1608
 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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "(nên dùng) thêm dòng Signed-off-by:"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "mặc định"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 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:1604
+#: builtin/commit.c:1613
 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:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "ký lần chuyển giao dùng GPG"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "chuyển giao tất cả các tập tin có thay đổi"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 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:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "vòng qua móc (hook) pre-commit và commit-msg"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "ok để ghi lại một thay đổi trống rỗng"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 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:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai h�ng (%s)"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, 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:1747
+#: builtin/commit.c:1756
+#, 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:1761
 #, 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:1752
-#, 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:1800
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7647,12 +7776,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "không thể tạo tập tin cấu hình “%s�"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7661,11 +7790,11 @@ msgstr ""
 "không thể ghi đè nhi�u giá trị với một giá trị đơn\n"
 "      Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "hiển thị kích cỡ theo định dạng dành cho ngư�i đ�c"
 
@@ -7689,47 +7818,47 @@ msgstr "hạng nhẹ"
 msgid "annotated"
 msgstr "có diễn giải"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "thẻ được chú giải %s không có tên nhúng"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "thẻ “%s� đã thực sự ở đây “%s� rồi"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, 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:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s không phải là một đối tượng “%s� hợp lệ"
 
-#: builtin/describe.c:306
+#: 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:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "�ang tìm kiếm để mô tả %s\n"
 
-#: builtin/describe.c:355
+#: 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:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7738,7 +7867,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:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7747,12 +7876,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:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "đã xuyên %lu qua lần chuyển giao\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7761,75 +7890,75 @@ 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:441
+#: builtin/describe.c:452
 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:442
+#: builtin/describe.c:453
 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:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "dùng ref bất kỳ"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "dùng thẻ bất kỳ, cả khi “unannotated�"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "luôn dùng định dạng dài"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "chỉ theo cha mẹ đầu tiên"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "chỉ xuất những gì khớp chính xác"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 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:453
+#: builtin/describe.c:464
 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:455
+#: builtin/describe.c:466
 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:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 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:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "dấu"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 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:462
+#: builtin/describe.c:473
 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:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long là xung khắc với tùy ch�n --abbrev=0"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 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:552
+#: builtin/describe.c:563
 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:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken là xung khắc với commit-ishes"
 
@@ -7843,21 +7972,21 @@ msgstr "“%s�: không phải tập tin bình thư�ng hay liên kết m�m"
 msgid "invalid option: %s"
 msgstr "tùy ch�n không hợp lệ: %s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "Không phải là kho git"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "đối tượng đã cho “%s� không hợp lệ."
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "đã cho nhi�u hơn hai đối tượng blob: “%s�"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "đã cho đối tượng không thể nắm giữ “%s�."
@@ -7868,27 +7997,27 @@ msgstr ""
 "git difftool [<các-tùy-ch�n>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] "
 "<đư�ng-dẫn>…]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "gặp lỗi: %d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "không đ�c được tập tin liên kết m�m %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Không thể đ�c đối tượng %s cho liên kết m�m %s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7896,53 +8025,53 @@ msgstr ""
 "các định dạng diff tổ hợp(“-c� và “--cc�) chưa được hỗ trợ trong\n"
 "chế độ diff thư mục(“-d� và “--dir-diff�)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "cả hai tập tin đã bị sửa: “%s� và “%s�."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "cây làm việc ở bên trái."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "các tập tin tạm đã sẵn có trong “%s�."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "bạn có lẽ muốn d�n dẹp hay "
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "thực hiện một diff toàn thư mục"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "đừng nhắc khi khởi chạy công cụ diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "dùng liên kết m�m trong diff-thư-mục"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<công_cụ>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "dùng công cụ diff đã cho"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -7950,19 +8079,19 @@ msgstr ""
 "làm cho “git-difftool� thoát khi g�i công cụ diff trả v� mã không phải số "
 "không"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<lệnh>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "chỉ định một lệnh tùy ý để xem diff"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 
@@ -7970,145 +8099,145 @@ msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "hiển thị tiến triển sau <n> đối tượng"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "ch�n đi�u khiển của thẻ đã ký"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "ch�n sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được l�c ra"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "�ổ các đánh dấu này vào tập-tin"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "nhập vào đánh dấu từ tập tin này"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "B� qua kết xuất của dữ liệu blob"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "�p dụng refspec cho refs đã xuất"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<các-tùy-ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<các-tùy-ch�n>] [<nhóm>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<các-tùy-ch�n>] [(<kho> | <nhóm>)…]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các-tùy-ch�n>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "lấy v� từ tất cả các máy chủ"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 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:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 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:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhi�u máy chủ cùng lúc"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 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:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "không lấy tất cả các thẻ (--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng th�i"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 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:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải v�"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "làm sâu hơn lịch sử của bản sao"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 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:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "tmục"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 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:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -8116,89 +8245,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:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy v�"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 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:512
+#: builtin/fetch.c:534
 #, 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:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "Không tìm thấy đối tượng %s"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "không thể fetch (lấy) v� nhánh hiện hành"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[cập nhật thẻ]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "không thể cập nhật tham chiếu nội bộ"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, 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:767
+#: builtin/fetch.c:789
 #, 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:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8207,57 +8336,57 @@ 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:921
+#: builtin/fetch.c:943
 #, 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:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s đã trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, 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:997
+#: builtin/fetch.c:1019
 #, 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:1000
+#: builtin/fetch.c:1022
 #, 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:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "Không biết làm cách nào để lấy v� từ %s"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "�ang lấy “%s� v�\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "không thể “%s� v�"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -8265,40 +8394,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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "Bạn phải định rõ tên thẻ."
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 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:1323
+#: builtin/fetch.c:1346
 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:1328
+#: builtin/fetch.c:1351
 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:1330
+#: builtin/fetch.c:1353
 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:1349
+#: builtin/fetch.c:1366
 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:1351
+#: builtin/fetch.c:1368
 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:1362
+#: builtin/fetch.c:1379
 #, 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:1370
+#: builtin/fetch.c:1387
 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ý"
 
@@ -8309,23 +8438,23 @@ msgstr ""
 "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
 "tin>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog�"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "bí danh cho --log (không được dùng)"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "văn bản"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "dùng <văn bản thư�ng> để bắt đầu ghi chú"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "tập tin để đ�c dữ liệu từ đó"
 
@@ -8367,101 +8496,105 @@ 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:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "các màu định dạng lưu tâm"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 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:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các-tùy-ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đ�c được"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 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:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 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:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 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:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "�ang kiểm tra các đối tượng"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<các-tùy-ch�n>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Gặp lỗi khi lấy thông tin thống kê v� tập tin %s: %s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8476,45 +8609,45 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "xóa b� các đối tượng không được tham chiếu"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "cẩn thận hơn nữa (tăng th�i gian chạy)"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "bật chế độ auto-gc"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 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:380
+#: builtin/gc.c:381
 #, 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:408
+#: builtin/gc.c:409
 #, 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:410
+#: builtin/gc.c:411
 #, 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:411
+#: builtin/gc.c:412
 #, 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:436
+#: builtin/gc.c:437
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8522,7 +8655,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:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -8533,12 +8666,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:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -8547,250 +8680,242 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "không hỗ trợ đa tuyến, b� qua %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "không thể đ�c cây (%s)"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, 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:912
+#: builtin/grep.c:694
 #, 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:999
+#: builtin/grep.c:781
 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:1001
+#: builtin/grep.c:783
 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:1003
+#: builtin/grep.c:785
 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:1005
+#: builtin/grep.c:787
 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:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "tên cơ sở"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "treo vào trước tên cơ sở cha mẹ của đư�ng dẫn vào kết xuất"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thư�ng"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đư�ng ranh giới từ"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 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:1021
+#: builtin/grep.c:800
 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:1024
+#: builtin/grep.c:803
 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:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 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:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 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:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 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:1048
+#: builtin/grep.c:827
 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:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 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:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 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:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 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:1062
+#: builtin/grep.c:841
 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:1065
+#: builtin/grep.c:844
 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:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C S�"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 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:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "đ�c mẫu từ tập-tin"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 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:1097
+#: builtin/grep.c:876
 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:1099
+#: builtin/grep.c:878
 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:1101
+#: builtin/grep.c:880
 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:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 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:1108
+#: builtin/grep.c:887
 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:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "chưa chỉ ra mẫu."
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 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:1211
+#: builtin/grep.c:989
 #, 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:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "không hỗ trợ đa tuyến, b� qua --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 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:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "tùy ch�n không được hỗ trợ với --recurse-submodules."
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 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:1316
+#: builtin/grep.c:1087
 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:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "cả hai --cached và các cây phải được chỉ ra."
 
@@ -8881,12 +9006,12 @@ msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "phiên bản của emacsclient “%d� quá cũ (< 22)."
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gặp lỗi khi thực thi “%s�"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8895,7 +9020,7 @@ msgstr ""
 "“%s�: đư�ng dẫn không hỗ trợ bộ trình chiếu man.\n"
 "Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd� để thay thế."
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8904,345 +9029,345 @@ msgstr ""
 "“%s�: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n"
 "Hãy cân nhắc đến việc sử dụng “man.<tool>.path� để thay thế."
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "“%s�: không rõ chương trình xem man."
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "�ịnh nghĩa các thuộc tính cho mỗi đư�ng dẫn"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Mỗi ngày h�c 20 lệnh Git hay hơn"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Thuật ngữ chuyên môn Git"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Chỉ định các tập tin không cần theo dõi"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "�ịnh nghĩa thuộc tính mô-đun-con"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Tổng quan v� luồng công việc khuyến nghị nên dùng với Git."
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "Các chỉ dẫn chung v� cách dùng Git là:\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "“git %s� được đặt bí danh thành “%s�"
+msgid "'%s' is aliased to '%s'"
+msgstr "“%s� được đặt bí danh thành “%s�"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "không thể mở %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, 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:225
+#: builtin/index-pack.c:226
 #, 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:228
+#: builtin/index-pack.c:229
 #, 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:270
+#: builtin/index-pack.c:271
 #, 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:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "gặp kết thúc tập tin EOF quá sớm"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "lỗi đ�c ở đầu vào"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 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:300
+#: builtin/index-pack.c:301
 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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 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:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "không thể mở packfile “%s�"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "chữ ký cho gói không khớp"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, 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:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "xả nén trả v� %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 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:536
+#: builtin/index-pack.c:537
 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:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "không hiểu kiểu đối tượng %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "không thể chạy hàm pread cho tập tin gói"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "sự mâu thuẫn xả nén nghiêm tr�ng"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SỰ VA CHẠM SHA1 �à XẢY RA VỚI %s!"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "không thể đ�c %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, 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:822
+#: builtin/index-pack.c:823
 #, 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:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "đối tượng blob không hợp lệ %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "Lỗi trong đối tượng"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "gặp lỗi khi áp dụng delta"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "�ang nhận v� các đối tượng"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "Các đối tượng bảng mục lục"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "gói bị sai h�ng (SHA1 không khớp)"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "không thể lấy thông tin thống kê packfile"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "pack có phần thừa ở cuối"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "�ang phân giải các delta"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "không thể tạo tuyến: %s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "lộn xộn hơn cả điên rồ"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "đầy đủ với %d đối tượng nội bộ"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa h�ng?)"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "gói có %d delta chưa được giải quyết"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "không thể xả nén đối tượng nối thêm (%d)"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị h�ng"
 
-#: builtin/index-pack.c:1408
+#: 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:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "không thể ghi tập tin giữ lại “%s�"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "không thể đóng tập tin giữ lại đã được ghi “%s�"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "không thể lưu tập tin gói"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "không thể lưu trữ tập tin ghi mục lục"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, 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:1554
+#: builtin/index-pack.c:1555
 #, 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:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: 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:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 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:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "dùng tùy ch�n --verify mà không đưa ra tên packfile"
 
@@ -9374,132 +9499,164 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "sửa các tập tin tại chỗ"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
 msgstr "bộ dò vết cắt b� phần trống rỗng"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "đặt phần đuôi mới ở đâu"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "thao tác khi đã có phần đuôi"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "thao tác khi thiếu phần đuôi"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "chỉ xuất phần đuôi"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "đừng áp dụng các quy tắc cấu hình"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "nối các giá trị khoảng-trắng-liên-tiếp"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "đặt các tùy ch�n phân tích cú pháp"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
 msgstr "bộ dò vết"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
 msgstr "bộ dò vết cần thêm"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer cùng với --only-input không hợp lý"
+
+#: builtin/interpret-trailers.c:127
 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:45
+#: builtin/log.c:46
 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:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<các-tùy-ch�n>] <đối-tượng>…"
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "tùy ch�n--decorate không hợp lệ: %s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "chặn m�i kết xuất từ diff"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "hiển thị mã nguồn"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "Sử dụng tập tin ánh xạ thư"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "các tùy ch�n trang trí"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 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:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "Không thể đ�c đối tượng %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Không nhận ra kiểu: %d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 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:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "Cần chính xác một vùng."
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "Không phải là một vùng."
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "“Cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 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:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "Hai thư mục kết xuất?"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Không hiểu lần chuyển giao %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, 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:1280
+#: builtin/log.c:1284
 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:1284
+#: builtin/log.c:1288
 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"
@@ -9510,219 +9667,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:1304
+#: builtin/log.c:1308
 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:1315
+#: builtin/log.c:1319
 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:1319
+#: builtin/log.c:1323
 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:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 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:1428
+#: builtin/log.c:1434
 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:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 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:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 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:1442
+#: builtin/log.c:1448
 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:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Dùng [RFC V�] thay cho [V�]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 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:1458
+#: builtin/log.c:1464
 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:1460
+#: builtin/log.c:1466
 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:1462
+#: builtin/log.c:1468
 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:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 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:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả l�i <message-id>"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng l�i nhắn, kiểu: “shallow�, “deep�"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "lần_chuyển_giao_n�n"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 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:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 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:1567
+#: builtin/log.c:1500
+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:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dòng thụt l� không hợp lệ: %s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n và  -k loại từ lẫn nhau."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc và -k xung khắc nhau."
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 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:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Không thể tạo thư mục “%s�"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đ�c tập tin chữ ký “%s�"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "�ang tạo các miếng vá"
+
+#: builtin/log.c:1805
 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:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9730,106 +9895,106 @@ msgstr ""
 "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
 "cách thủ công.\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<các-tùy-ch�n>] [<tập-tin>…]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "nhận dạng các trạng thái tập tin với thẻ"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 "dùng chữ cái viết thư�ng cho các tập tin “assume unchanged� (giả định không "
 "thay đổi)"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "hiển thị các tập tin đã xóa trong kết xuất"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "hiển thị các tập tin khác trong kết xuất"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "hiển thị các tập tin bị b� qua trong kết xuất"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ b�"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "chỉ hiển thị tên của các thư mục “khác�"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "hiển thị kết thúc dòng của các tập tin"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "không hiển thị thư mục rỗng"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "hiển thị thông tin resolve-undo"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "b� qua những tập tin khớp với một mẫu"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "mẫu loại trừ được đ�c từ <tập tin>"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "đ�c thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "thêm loại trừ tiêu chuẩn kiểu git"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "đệ quy xuyên qua mô-đun con"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "tree-ish"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "giả định rằng các đư�ng dẫn đã bị gỡ b� kể từ <tree-ish> nay vẫn hiện diện"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "hiển thị dữ liệu gỡ lỗi"
 
@@ -9920,180 +10085,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:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<các-tùy-ch�n>] [<commit>…]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, 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:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, 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:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 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:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 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:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 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:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 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:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "chiến lược"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 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:223
+#: builtin/merge.c:226
 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:227
+#: builtin/merge.c:230
 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:229
+#: builtin/merge.c:232
 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:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "cho phép hòa trộn lịch sử không liên quan"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "thẩm tra móc (hook) commit-msg"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, 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:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " (không có gì để squash)"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, 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:447
+#: 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:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 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:671
+#: builtin/merge.c:680
 #, 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:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, 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:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10111,71 +10280,71 @@ msgstr ""
 "rá»—ng\n"
 "sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, 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:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "không phải nhánh hiện hành"
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 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:898
+#: builtin/merge.c:919
 #, 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:945
+#: builtin/merge.c:972
 #, 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:1046
+#: builtin/merge.c:1073
 #, 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:1080
+#: builtin/merge.c:1107
 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:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 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:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 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:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10183,7 +10352,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:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10191,115 +10360,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:1191
+#: builtin/merge.c:1218
 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:1200
+#: builtin/merge.c:1227
 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:1208
+#: builtin/merge.c:1235
 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:1225
+#: builtin/merge.c:1252
 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:1227
+#: builtin/merge.c:1254
 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:1232
+#: builtin/merge.c:1259
 #, 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:1234
+#: builtin/merge.c:1261
 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:1268
+#: builtin/merge.c:1295
 #, 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:1271
+#: builtin/merge.c:1298
 #, 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:1274
+#: builtin/merge.c:1301
 #, 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:1277
+#: builtin/merge.c:1304
 #, 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:1339
+#: builtin/merge.c:1366
 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:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "�ã cập nhật rồi."
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, 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:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "�ã cập nhật rồi. Yeeah!"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 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:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, 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:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�ang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, 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:1532
+#: builtin/merge.c:1559
 #, 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:1541
+#: builtin/merge.c:1568
 #, 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:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -10441,7 +10610,7 @@ msgstr "git mv [<các-tùy-ch�n>] <nguồn>… <đích>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Thư mục “%s� có ở trong chỉ mục mà không có mô-đun con?"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
@@ -10459,68 +10628,68 @@ msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã
 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:168
+#: builtin/mv.c:167
 #, 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:179
+#: builtin/mv.c:178
 #, 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:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "nguồn sai"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 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:189
+#: builtin/mv.c:188
 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:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "thư mục nguồn là trống rỗng"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "không nằm dưới sự quản lý mã nguồn"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "đích đã tồn tại sẵn rồi"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "đang ghi đè lên “%s�"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "Không thể ghi đè"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "Nhi�u nguồn cho cùng một đích"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "thư mục đích không tồn tại"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, nguồn=%s, đích=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s�"
@@ -10712,19 +10881,19 @@ 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:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "không thể đ�c “%s�"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đ�c “%s�"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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 "gặp lỗi khi phân giải “%s� như là một tham chiếu hợp lệ."
@@ -10752,47 +10921,47 @@ msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s� sang “%s�"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "quá nhi�u đối số"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "không tìm thấy ghi chú cho đối tượng %s."
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "nội dung ghi chú (note) nằm trong một tập tin"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "cho lưu trữ ghi chú trống rỗng"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "thay thế ghi chú trước"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10801,29 +10970,29 @@ msgstr ""
 "Không thể thêm các ghi chú. �ã tìm thấy các ghi chú đã có sẵn cho đối tượng "
 "%s. Sử dụng tùy ch�n “-f� để ghi đè lên các ghi chú cũ"
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "�ang ghi đè lên ghi chú cũ cho đối tượng %s\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "�ang gỡ b� ghi chú (note) cho đối tượng %s\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "đ�c các đối tượng từ đầu vào tiêu chuẩn"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "quá ít đối số"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10832,12 +11001,12 @@ msgstr ""
 "Không thể sao chép các ghi chú. �ã tìm thấy các ghi chú đã có sẵn cho đối "
 "tượng %s. Sử dụng tùy ch�n “-f� để ghi đè lên các ghi chú cũ"
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10846,52 +11015,52 @@ msgstr ""
 "Các tùy ch�n -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit�.\n"
 "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C�.\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "gặp lỗi khi gỡ b� cây làm việc “git notes merge�"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "gặp lỗi khi đ�c tham chiếu NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "Tùy ch�n v� hòa trộn"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10899,48 +11068,48 @@ msgstr ""
 "phân giải các xung đột “notes� sử dụng chiến lược đã đưa ra (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "Chuyển giao các note chưa được hòa trộn"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
 "giao"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "Hủy b� phân giải ghi chú (note) hòa trộn"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "b� qua hòa trộn các ghi chú (note)"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "không hiểu -s/--strategy: %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10951,223 +11120,223 @@ msgstr ""
 "chuyển giao kết quả bằng “git notes merge --commit�, hoặc bãi b� việc hòa "
 "trộn bằng “git notes merge --abort�.\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "�ối tượng %s không có ghi chú (note)\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "cố gắng gỡ b� một note chưa từng tồn tại không phải là một lỗi"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 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:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "không gỡ b�, chỉ hiển thị"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes� từ <notes-ref>"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [các-tùy-ch�n…] [< <danh-sách-tham-chiếu> | < "
 "<danh-sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 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:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "lỗi giải nén (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 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:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "�ang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 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:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "�ang nén các đối tượng"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, 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:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s�"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "không hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "hiển thị bộ đo tiến trình"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 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:2884
+#: builtin/pack-objects.c:2890
 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:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "phiên bản[,offset]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 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:2889
+#: builtin/pack-objects.c:2895
 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:2891
+#: builtin/pack-objects.c:2897
 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:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "b� qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 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:2897
+#: builtin/pack-objects.c:2903
 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:2899
+#: builtin/pack-objects.c:2905
 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:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 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:2909
+#: builtin/pack-objects.c:2915
 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:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr " đ�c tham số “revision� từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 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:2916
+#: builtin/pack-objects.c:2922
 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:2919
+#: builtin/pack-objects.c:2925
 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:2922
+#: builtin/pack-objects.c:2928
 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:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 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:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "pack mất các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 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:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 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:2940
+#: builtin/pack-objects.c:2946
 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:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 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:2946
+#: builtin/pack-objects.c:2952
 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:2948
+#: builtin/pack-objects.c:2954
 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:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "�ang đếm các đối tượng"
 
@@ -11183,11 +11352,11 @@ msgstr "đóng gói m�i thứ"
 msgid "prune loose refs (default)"
 msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "�ang gỡ các đối tượng trùng lặp"
 
@@ -11228,7 +11397,7 @@ msgstr "Các tùy ch�n liên quan đến hòa trộn"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "cho phép chuyển-tiếp-nhanh"
 
@@ -11249,7 +11418,7 @@ msgstr "số lượng mô-đun-con được đẩy lên đồng th�i"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Giá trị không hợp lệ cho pull.ff: %s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11257,14 +11426,14 @@ msgstr ""
 "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
 "lấy v�."
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
 "v�."
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11273,7 +11442,7 @@ msgstr ""
 "tá»±\n"
 "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11285,43 +11454,43 @@ msgstr ""
 "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
 "một nhánh trên dòng lệnh."
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "Xem git-pull(1) để biết thêm chi tiết."
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<máy chủ>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<nhánh>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 ""
 "Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11330,29 +11499,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:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "b� qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 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:848
+#: builtin/pull.c:852
 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:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "pull vá»›i rebase"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 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:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11363,7 +11532,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:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11381,15 +11550,15 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 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:901
+#: builtin/pull.c:905
 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:908
+#: builtin/pull.c:912
 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ộ"
@@ -11776,19 +11945,47 @@ msgstr "gỡ lỗi “unpack-trees�"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<các-tùy-ch�n>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "giữ lại các lần chuyển giao rỗng"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "tiếp tục cải tổ"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "bãi b� việc cải tổ"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "tạo văn lệnh rebase"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "Rút ngắn SHA-1 trong danh sách cần làm"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "Khai triển SHA-1 trong danh sách cần làm"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "kiểm tra danh sách cần làm"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "b� qua các lệnh cậy (pick) không cần thiết"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "sắp xếp lại các dòng fixup/squash"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11818,7 +12015,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:858
+#: builtin/receive-pack.c:859
 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"
@@ -11839,11 +12036,11 @@ 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:1932
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "Bạn phải chỉ định thư mục."
 
@@ -11993,12 +12190,12 @@ msgstr "Ä‘ang chỉ định má»™t nhánh master không hợp lý vá»›i tùy chá»
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror�"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "máy chủ %s đã tồn tại rồi."
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "“%s� không phải tên máy chủ hợp lệ"
@@ -12021,17 +12218,17 @@ msgstr "(khá»›p)"
 msgid "(delete)"
 msgstr "(xóa)"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "Không có máy chủ nào như thế: %s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Không thể đổi tên phần của cấu hình từ “%s� thành “%s�"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12042,17 +12239,17 @@ msgstr ""
 "\t%s\n"
 "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "gặp lỗi khi xóa “%s�"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "gặp lỗi khi tạo “%s�"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12064,113 +12261,113 @@ msgstr[0] ""
 "Ä‘i;\n"
 "để xóa đi, sử dụng:"
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Không thể gỡ b� phần cấu hình “%s�"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " mới (lần lấy v� tiếp theo sẽ lưu trong remotes/%s)"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " được theo dõi"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " cũ rích (dùng “git remote prune� để gỡ b�)"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge không hợp lệ; không thể cải tổ v� phía > 1 nhánh"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "thực hiện rebase trên máy chủ %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    và với máy chủ %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "tạo"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "xóa"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "đã cập nhật"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "có-thể-chuyển-tiếp-nhanh"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "dữ liệu nội bộ đã cũ"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ép buộc thành %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s đẩy lên thành %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ép buộc thành %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s đẩy lên thành %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "không truy vấn các máy chủ"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* máy chủ %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL để lấy v�: %s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(không có URL)"
 
@@ -12178,181 +12375,181 @@ msgstr "(không có URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL để đẩy lên: %s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhánh HEAD: %s"
 
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "(không yêu cầu)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "(không hiểu)"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Những nhánh trên máy chủ:%s"
 
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr " (trạng thái không được yêu cầu)"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Những nhánh nội bộ đã được cấu hình cho lệnh “git pull�:"
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  refs nội bộ sẽ được phản chiếu bởi lệnh “git push�"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Những tham chiếu nội bộ được cấu hình cho lệnh “git push�%s:"
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xóa refs/remotes/<tên>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "Không thể xác định được HEAD máy chủ"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Nhi�u nhánh HEAD máy chủ. Hãy ch�n rõ ràng một:"
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "Không thể xóa b� %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Không phải là tham chiếu hợp lệ: %s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "Không thể cài đặt %s"
 
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s đã trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "�ang xén bớt %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nên xén bớt] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [đã bị xén] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "cắt máy chủ sau khi lấy v�"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Không có máy chủ nào có tên “%s�"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "thêm nhánh"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "chưa chỉ ra máy chủ nào"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vấn đẩy URL thay vì lấy"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "trả v� m�i URL"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "không có URL nào được cấu hình cho nhánh “%s�"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "đẩy các “URL� bằng tay"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "thêm URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "xóa URLs"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete không hợp lý"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Không tìm thấy URL như vậy: %s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "Sẽ không xóa những địa chỉ URL không-push"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "chi tiết; phải được đặt trước một lệnh-con"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Không hiểu câu lệnh con: %s"
@@ -12449,7 +12646,7 @@ msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable và -A xung khắc nhau"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "gặp lỗi khi gỡ b� “%s�"
@@ -12583,121 +12780,121 @@ msgstr "hòa trộn"
 msgid "keep"
 msgstr "giữ lại"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "Bạn không có HEAD nào hợp lệ."
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "Gặp lỗi khi tìm cây của HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Gặp lỗi khi tìm cây của %s."
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện gi� tại %s"
 
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, 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:286
+#: builtin/reset.c:297
 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:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "đặt lại (reset) HEAD và bảng mục lục"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 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:295
+#: builtin/reset.c:306
 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:301
+#: builtin/reset.c:312
 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:320
+#: builtin/reset.c:329
 #, 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:328
+#: builtin/reset.c:337
 #, 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:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch xung khắc với --{hard,mixed,soft}"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 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:348
+#: builtin/reset.c:357
 #, 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:358
+#: builtin/reset.c:367
 #, 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:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N chỉ được dùng khi có --mixed"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "Những thay đổi được đưa ra kh�i bệ phóng sau khi reset:"
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, 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:389
+#: builtin/reset.c:398
 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:358
+#: builtin/rev-list.c:361
 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-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<các-tùy-ch�n>] -- [<các tham số>…]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "giữ lại “--� chuyển sang làm tham số"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "dừng phân tích sau đối số đầu tiên không có tùy ch�n"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "kết xuất trong định dạng gậy dài"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12788,11 +12985,11 @@ msgstr "chấp nhận chuyển giao mà không ghi chú gì"
 msgid "keep redundant, empty commits"
 msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "hoàn nguyên gặp lỗi"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "cherry-pick gặp lỗi"
 
@@ -12857,17 +13054,17 @@ msgstr "cho phép gỡ b� đệ qui"
 msgid "exit with a zero status even if nothing matched"
 msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "không thể gỡ b� “%s� một cách đệ qui mà không có tùy ch�n -r"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: không thể gỡ b� %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "không thể gỡ b� “%s�"
@@ -12904,27 +13101,27 @@ msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<các-tùy-ch�n>] [<vùng-xét-duyệt>] [[--] [<đư�ng-dẫn>…]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "Nhóm theo ngư�i chuyển giao thay vì tác giả"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Chặn m�i mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "Hiển thị thư điện tử cho từng tác giả"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "Ngắt dòng khi quá dài"
 
@@ -13125,35 +13322,35 @@ 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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "Không có tham chiếu nào như thế: %s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, 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:72
+#: builtin/submodule--helper.c:71
 #, 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:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 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:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, 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:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13162,81 +13359,81 @@ 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:406
+#: builtin/submodule--helper.c:400
 #, 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:410
+#: builtin/submodule--helper.c:404
 #, 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:420
+#: builtin/submodule--helper.c:414
 #, 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:427
+#: builtin/submodule--helper.c:421
 #, 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:443
+#: builtin/submodule--helper.c:437
 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:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, 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:604
+#: builtin/submodule--helper.c:597
 #, 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:611
+#: builtin/submodule--helper.c:604
 #, 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:633
+#: builtin/submodule--helper.c:626
 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:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 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:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "chi�u sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "ép buộc tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13244,84 +13441,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:684
+#: builtin/submodule--helper.c:677
 #, 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:699
+#: builtin/submodule--helper.c:692
 #, 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:764
+#: builtin/submodule--helper.c:757
 #, 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:768
+#: builtin/submodule--helper.c:761
 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:793
+#: builtin/submodule--helper.c:790
 #, 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:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "B� qua mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, 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:953
+#: builtin/submodule--helper.c:963
 #, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "đư�ng dẫn đến cây làm việc"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 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:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoặc không làm gì cả"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 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:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "công việc đồng th�i"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 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:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "đừng in tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 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:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "giá trị cho  tham số cập nhật bị sai"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13330,20 +13527,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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s không hỗ trợ --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, 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ệ"
@@ -13356,23 +13553,23 @@ msgstr "git symbolic-ref [<các-tùy-ch�n>] <tên> [<t.chiếu>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <tên>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "chặn các thông tin lỗi cho các tham chiếu “không-m�m� (bị tách ra)"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "xóa tham chiếu m�m"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
 msgstr "làm ngắn kết xuất ref (tham chiếu)"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "lý do"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "lý do cập nhật"
 
@@ -13402,17 +13599,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<định_dạng>]  <tên-thẻ>…"
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "không tìm thấy tìm thấy thẻ “%s�."
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Thẻ đã bị xóa “%s� (từng là %s)\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13425,7 +13622,7 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được b� qua.\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13440,143 +13637,143 @@ msgstr ""
 "Những dòng được bắt đầu bằng “%c� sẽ được giữ lại; bạn có thể xóa chúng đi "
 "nếu muốn.\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "không thể ký thẻ"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "không thể ghi vào tập tin lưu thẻ"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "kiểu đối tượng sai."
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, 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:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "chỉ liệt kê tên các thẻ"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "hiển thị <n> dòng cho mỗi ghi chú"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "xóa thẻ"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "thẩm tra thẻ"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "Tùy ch�n tạo thẻ"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "để chú giải cho thẻ, cần một l�i ghi chú"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "phần chú thích cho thẻ"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "thẻ chú giải và ký kiểu GPG"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "dùng kháo khác để ký thẻ"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "thay thế nếu thẻ đó đã có trước"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "tạo một reflog"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "Các tùy ch�n liệt kê thẻ"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "hiển thị danh sách thẻ trong các cột"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 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:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 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:425
+#: builtin/tag.c:403
 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:426
+#: builtin/tag.c:404
 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:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column và -n xung khắc nhau"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 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:494
+#: builtin/tag.c:477
 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:496
+#: builtin/tag.c:479
 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:498
+#: builtin/tag.c:481
 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:500
+#: builtin/tag.c:483
 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:511
+#: builtin/tag.c:494
 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:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "quá nhi�u đối số"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s� không phải thẻ hợp lệ."
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "�ã cập nhật thẻ “%s� (trước là %s)\n"
@@ -13645,131 +13842,131 @@ msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư m
 msgid " OK"
 msgstr " �ồng ý"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<các-tùy-ch�n>] [--] [<tập-tin>…]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "refresh: l� đi mô-đun-con"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "không b� qua các tập tin mới tạo"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "để các tập tin thay thế các thư mục và “vice-versa�"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "lấy lại thông tin thống kê"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "giống --refresh, nhưng b� qua các cài đặt “assume-unchanged�"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<chế_độ>,<đối_tượng>,<đư�ng_dẫn>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "�ánh dấu các tập tin là \"không thay đổi\""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "đánh dấu các tập tin là “chỉ-đ�c�"
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "xóa bít skip-worktree"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "gỡ b� các đư�ng dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
 "làm việc"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "với tùy ch�n --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "đ�c danh sách đư�ng dẫn cần cập nhật từ đầu vào tiêu chuẩn"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "không thể đ�c các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "phục hồi các trạng thái #2 và #3 cho các đư�ng dẫn được liệt kê"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "b� qua các tập-tin thiếu trong thư-mục làm việc"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(cho “porcelains�) quên các xung đột chưa được giải quyết đã ghi"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "ghi mục lục ở định dạng này"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "bật/tắt chia cắt bảng mục lục"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "bật/tắt bộ đệm không theo vết"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13777,7 +13974,7 @@ msgstr ""
 "core.splitIndex được đặt là sai; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn bật chia tách mục lục"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13785,7 +13982,7 @@ msgstr ""
 "core.splitIndex được đặt là đúng; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn tắt chia tách mục lục"
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13793,11 +13990,11 @@ msgstr ""
 "core.untrackedCache được đặt là đúng; xóa b� hay thay đổi nó, nếu bạn thực "
 "sự muốn tắt bộ đệm chưa theo dõi"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "Nhớ đệm không theo vết bị tắt"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13805,7 +14002,7 @@ msgstr ""
 "core.untrackedCache được đặt là sai; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn bật bộ đệm chưa theo dõi"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Nhớ đệm không theo vết được bật cho “%s�"
@@ -13822,19 +14019,19 @@ msgstr "git update-ref [<các-tùy-ch�n>]    <refname> <biến-mới> [<biến
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<các-tùy-ch�n>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "xóa tham chiếu"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "đ�c cập nhật từ đầu vào tiêu chuẩn"
 
@@ -13898,102 +14095,109 @@ msgstr "git worktree prune [<các-tùy-ch�n>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </đư�ng/dẫn>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, 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:50
+#: builtin/worktree.c:52
 #, 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:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, 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:66
+#: builtin/worktree.c:76
+#, 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:84
 #, 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:82
+#: builtin/worktree.c:100
 #, 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:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "báo cáo các cây làm việc đã prune"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 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:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s� đã có từ trước rồi"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s�"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "�ang chuẩn bị %s (định danh %s)"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 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:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "di chuyển cây làm việc mới"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "giữ cây làm việc mới bị khóa"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 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:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "lý do khóa"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, 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:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 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:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "“%s� đã được khóa rồi, lý do: %s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s� đã được khóa rồi"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s� chưa bị khóa"
@@ -14018,23 +14222,23 @@ msgstr "chỉ hữu ích khi cần gỡ lỗi"
 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:1040
 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:1042
 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:1044
 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:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "ngắt truy�n thông sau <n> giây không hoạt động"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14047,7 +14251,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
 
@@ -14061,20 +14265,20 @@ 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:337
+#: http.c:338
 #, 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:358
+#: http.c:359
 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:367
+#: http.c:368
 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:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14443,7 +14647,7 @@ msgstr "Không thể tìm thấy lần chuyển giao chung với $pretty_name"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "�ã cập nhật với $pretty_name rồi"
 
 #: git-merge-octopus.sh:89
@@ -14462,56 +14666,58 @@ msgstr "Hòa trá»™n Ä‘Æ¡n giản không làm việc, thá»­ hòa trá»™n tá»± Ä‘á»
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"Khi bạn cần giải quyết vấn đ� này hãy chạy lệnh \"git rebase --continue\".\n"
-"Nếu bạn có ý định b� qua miếng vá, thay vào đó bạn chạy \"git rebase --skip"
-"\".\n"
-"�ể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git "
-"rebase --abort\"."
+"Giải quyết vấn đ� này thủ công, hãy đanh dấu chúng đã được giải quyết bằng\n"
+"hãy chạy lệnh \"git add/rm <các_tập_tin_xung_đột>\", sau đó chạy \"git "
+"rebase --continue\".\n"
+"Bạn có thể b� qua miếng vá, chạy \"git rebase --skip\".\n"
+"�ể bãi b� và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
+"--abort\"."
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "Không thể quay trở lại $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "�ã áp dụng autostash."
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Không thể lưu $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 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ể chạy lệnh "
 "rebase."
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 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:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "Không thể đ�c HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14519,7 +14725,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:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14540,102 +14746,102 @@ 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:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "thượng nguồn không hợp lệ $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, 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:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, 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:506
+#: git-rebase.sh:516
 #, 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:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "nghiêm tr�ng: không có nhánh như thế: $branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "Không thể autostash"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "�ã tạo autostash: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 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:591
+#: git-rebase.sh:601
 #, 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:595
+#: git-rebase.sh:605
 #, 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:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Thay đổi từ $mb thành $onto:"
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 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:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 "git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "Không thể ghi lại các tập tin chưa theo dõi"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "Chưa có thay đổi nào được ch�n"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Không thể gỡ b� bảng mục lục tạm th�i (không thể xảy ra)"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Không thể cập nhật $ref_stash với $w_commit"
@@ -14650,7 +14856,7 @@ msgstr "Không thể cập nhật $ref_stash với $w_commit"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14660,107 +14866,107 @@ msgstr ""
 "     �ể có thể dùng l�i chú thích có chứa -- ở đầu,\n"
 "     dùng git stash save -- \"$option\""
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc."
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "Không có thay đổi nội bộ nào được ghi lại"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "Không thể khởi tạo stash"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "Không thể ghi lại trạng thái hiện hành"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 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:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "Không thể gỡ b� các thay đổi cây-làm-việc"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "không hiểu tùy ch�n: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 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:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Chỉ ra quá nhi�u điểm xét duyệt: $REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, 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:537
+#: git-stash.sh:545
 #, 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:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "�$args� không phải tham chiếu đến stash"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "không thể làm tươi mới bảng mục lục"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 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:568
+#: git-stash.sh:576
 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:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "Không thể ghi lại cây chỉ mục"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 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:604
+#: git-stash.sh:612
 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:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được b� stash."
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 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:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "�ã xóa ${REV} ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Không thể xóa b� mục stash"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(�ể phục hồi lại chúng hãy gõ \"git stash apply\")"
 
@@ -14912,19 +15118,19 @@ msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath�"
 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:638
+#: git-submodule.sh:637
 #, 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:648
+#: git-submodule.sh:647
 #, 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:653
+#: git-submodule.sh:652
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14933,12 +15139,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:671
+#: git-submodule.sh:670
 #, 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:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14947,86 +15153,86 @@ 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:684
+#: git-submodule.sh:683
 #, 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:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: đã checkout “$sha1�"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, 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:690
+#: git-submodule.sh:689
 #, 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:695
+#: git-submodule.sh:694
 #, 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:696
+#: git-submodule.sh:695
 #, 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:701
+#: git-submodule.sh:700
 #, 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:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, 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:841
+#: git-submodule.sh:840
 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:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "chế độ không như mong ch� $mod_dst"
 
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, 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:916
+#: git-submodule.sh:915
 #, 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:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath�"
@@ -15045,13 +15251,13 @@ msgstr "�ang rebase ($new_count/$total)"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
@@ -15139,48 +15345,48 @@ msgstr "Không thể di chuyển HEAD đến $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Từ chối squash lần hòa trộn: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, 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:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Không thể lấy ra $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, 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:421
+#: git-rebase--interactive.sh:422
 #, 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:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Không thể $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 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:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "Không thể áp dụng $sha1… $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15196,31 +15402,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:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Bị dừng tại $sha1_abbrev… $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, 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:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Thá»±c thi: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Thực thi gặp lỗi: $rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 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:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15231,7 +15437,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15246,96 +15452,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Lệnh chưa biết: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 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:703
+#: git-rebase--interactive.sh:704
 #, 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:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Không thể b� qua các lệnh cậy (pick) không cần thiết"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong dòng "
-"sau đây:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "không thể tách r�i HEAD"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-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ũ):"
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"�ể tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa b� một lần "
-"chuyển giao.\n"
-"\n"
-"Dùng “git config rebase.missingCommitsCheck� để thay đổi mức độ của cảnh "
-"báo.\n"
-"Cánh ứng xử có thể là: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Không thừa nhận cài đặt $check_level for option rebase.missingCommitsCheck. "
-"Nên b� qua."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Bạn có thể sửa nó bằng “git rebase --edit-todo� và sau đó chạy “git rebase --"
-"continue�."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Hoặc là bạn có thể bãi b� lần cải tổ với lệnh “git rebase --abort�."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Không thể xóa b� CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15366,11 +15505,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 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:1110
+#: git-rebase--interactive.sh:811
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
@@ -15379,11 +15518,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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 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:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15397,39 +15536,39 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "Không thể thực thi trình biên soạn"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Không thể checkout $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "Không HEAD?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, 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:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "Không thể đánh dấu là tương tác"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 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:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15438,7 +15577,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:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
 
@@ -16024,60 +16163,60 @@ msgstr "múi gi� nội bộ khác biệt với GMT bởi khoảng th�i gian
 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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 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:291
+#: git-send-email.perl:290
 #, 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:296
+#: git-send-email.perl:295
 #, 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:314
+#: git-send-email.perl:313
 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:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 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:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Không hiểu trư�ng --suppress-cc: “%s�\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Không hiểu cài đặt --confirm: “%s�\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, 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:511
+#: git-send-email.perl:506
 #, 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:513
+#: git-send-email.perl:508
 #, 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:518
+#: git-send-email.perl:513
 #, 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:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16092,12 +16231,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:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gặp lỗi khi mở thư mục “%s�: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16106,7 +16245,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:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16116,17 +16255,17 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Không có dòng chủ đ� trong %s?"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gặp lỗi khi mở “%s� để ghi: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16140,31 +16279,31 @@ 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:712
+#: 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:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gặp lỗi khi mở “%s�: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 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:791
+#: git-send-email.perl:786
 #, 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:820
+#: git-send-email.perl:815
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16172,11 +16311,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:825
+#: git-send-email.perl:820
 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:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16189,20 +16328,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:852
+#: git-send-email.perl:847
 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:870
+#: git-send-email.perl:865
 #, 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:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, 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"
@@ -16210,16 +16349,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:944
+#: git-send-email.perl:939
 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:1245
+#: git-send-email.perl:1260
 #, 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:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16246,134 +16385,190 @@ 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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "Gửi thư này trả l�i yêu cầu"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 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:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gặp lỗi! %s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 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:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gặp lỗi khi gửi %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thá»­ gá»­i %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gá»­i %s\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "không thể mở tập tin “%s�"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, 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:1534
+#: git-send-email.perl:1549
 #, 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:1582
+#: git-send-email.perl:1597
 #, 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:1605
+#: git-send-email.perl:1622
 #, 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:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Không thể thực thi “%s�"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) �ang thêm %s: %s từ: “%s�\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, 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:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "không thể lấy gửi thư dạng 7 bít"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "bảng mã truy�n không hợp lệ"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "không thể mở %s: %s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, 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:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, 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 "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) không nhận các đối số"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s�"
+
+#~ msgid "change upstream info"
+#~ msgstr "thay đổi thông tin thượng nguồn"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nếu bạn muốn “%s� theo dõi “%s�, thực hiện lệnh sau:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "tên cơ sở"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "treo vào trước tên cơ sở cha mẹ của đư�ng dẫn vào kết xuất"
+
+#~ msgid ""
+#~ "When you have resolved this problem, run \"git rebase --continue\".\n"
+#~ "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
+#~ "To check out the original branch and stop rebasing, run \"git rebase --"
+#~ "abort\"."
+#~ msgstr ""
+#~ "Khi bạn cần giải quyết vấn đ� này hãy chạy lệnh \"git rebase --continue"
+#~ "\".\n"
+#~ "Nếu bạn có ý định b� qua miếng vá, thay vào đó bạn chạy \"git rebase --"
+#~ "skip\".\n"
+#~ "�ể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy "
+#~ "\"git rebase --abort\"."
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Cảnh báo: SHA-1 bị thiếu hoặc không phải là một lần chuyển giao trong "
+#~ "dòng sau đây:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Cảnh báo: lệnh không nhận ra trong dòng sau đây:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Hoặc là bạn có thể bãi b� lần cải tổ với lệnh “git rebase --abort�."
+
 #~ msgid "%"
 #~ msgid_plural "%"
 #~ msgstr[0] "%"
@@ -16834,9 +17029,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 #~ msgstr ""
 #~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật"
 
-#~ msgid "unable to parse format"
-#~ msgstr "không thể phân tích định dạng"
-
 #~ msgid "improper format entered align:%s"
 #~ msgstr "định dạng không đúng chỗ căn chỉnh:%s"
 
@@ -16971,18 +17163,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 #~ msgid "-b and -B are mutually exclusive"
 #~ msgstr "-b và -B loại từ lẫn nhau."
 
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "Khi bạn cần giải quyết vấn đ� này hãy chạy lệnh \"$cmdline --continue\".\n"
-#~ "Nếu bạn có ý định b� qua miếng vá, thay vào đó bạn chạy \"$cmdline --skip"
-#~ "\".\n"
-#~ "�ể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy "
-#~ "\"$cmdline --abort\"."
-
 #~ msgid "Patch format $patch_format is not supported."
 #~ msgstr "�ịnh dạng miếng vá $patch_format không được hỗ trợ."
 
@@ -17056,9 +17236,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 #~ msgid "no files added"
 #~ msgstr "chưa có tập tin nào được thêm vào"
 
-#~ msgid "force creation (when already exists)"
-#~ msgstr "ép buộc tạo (khi đã có nhánh cùng tên)"
-
 #~ msgid "slot"
 #~ msgstr "khe"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51f5bc9a4..d3aaf09b9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -121,6 +121,7 @@
 #   tagger                           |  打标签者
 #   topic branch                     |  主题分支
 #   track                            |  跟踪
+#   trailer                          |  尾部署�
 #   tree                             |  树（工作区或树对象）
 #   tree object                      |  树对象
 #   tree-ish (also treeish)          |  树对象（或�以解�为一树对象）
@@ -136,8 +137,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-02 08:00+0800\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-24 09:43+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -188,7 +189,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲�而退出。"
 
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
@@ -237,82 +238,82 @@ msgstr "未能识别的空白字符选项 '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c:126
+#: apply.c:125
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject 和 --3say �能�时使用。"
 
-#: apply.c:128
+#: apply.c:127
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached 和 --3way �能�时使用。"
 
-#: apply.c:131
+#: apply.c:130
 msgid "--3way outside a repository"
 msgstr "--3way 在一个仓库之外"
 
-#: apply.c:142
+#: apply.c:141
 msgid "--index outside a repository"
 msgstr "--index 在一个仓库之外"
 
-#: apply.c:145
+#: apply.c:144
 msgid "--cached outside a repository"
 msgstr "--cached 在一个仓库之外"
 
-#: apply.c:836
+#: apply.c:845
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "无法准备时间戳正则表达� %s"
 
-#: apply.c:845
+#: apply.c:854
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，输入为：%s"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "�能在补�的第 %d 行找到文件�"
 
-#: apply.c:967
+#: apply.c:966
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: apply.c:973
+#: apply.c:972
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件��一致"
 
-#: apply.c:974
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件��一致"
 
-#: apply.c:979
+#: apply.c:978
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
 
-#: apply.c:1008
+#: apply.c:1007
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "第 %d 行包�无效文件模�：%s"
 
-#: apply.c:1326
+#: apply.c:1325
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "�一致的文件头，%d 行和 %d 行"
 
-#: apply.c:1498
+#: apply.c:1497
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：�外的行：%.*s"
 
-#: apply.c:1567
+#: apply.c:1566
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补�片段没有头信�：%.*s"
 
-#: apply.c:1587
+#: apply.c:1586
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -323,82 +324,82 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 msgstr[1] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 
-#: apply.c:1600
+#: apply.c:1599
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的头信�中缺�文件�信�（第 %d 行）"
 
-#: apply.c:1770
+#: apply.c:1787
 msgid "new file depends on old contents"
 msgstr "新文件�赖旧内容"
 
-#: apply.c:1772
+#: apply.c:1789
 msgid "deleted file still has contents"
 msgstr "删除的文件�有内容"
 
-#: apply.c:1806
+#: apply.c:1823
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补�在第 %d 行��"
 
-#: apply.c:1843
+#: apply.c:1860
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s �赖旧内容"
 
-#: apply.c:1845
+#: apply.c:1862
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s �有内容"
 
-#: apply.c:1848
+#: apply.c:1865
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s �为空文件但并未删除"
 
-#: apply.c:1995
+#: apply.c:2012
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补�在第 %d 行��：%.*s"
 
-#: apply.c:2032
+#: apply.c:2049
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补��于第 %d 行"
 
-#: apply.c:2193
+#: apply.c:2209
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补�文件的第 %d 行�有垃圾数�"
 
-#: apply.c:2276
+#: apply.c:2295
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: apply.c:2280
+#: apply.c:2299
 #, c-format
 msgid "unable to open or read %s"
 msgstr "�能打开或读� %s"
 
-#: apply.c:2933
+#: apply.c:2958
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3052
+#: apply.c:3077
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "� #%d �功应用于 %d（�移 %d 行）"
 msgstr[1] "� #%d �功应用于 %d（�移 %d 行）"
 
-#: apply.c:3064
+#: apply.c:3089
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文�少到（%ld/%ld）以在第 %d 行应用补�片段"
 
-#: apply.c:3070
+#: apply.c:3095
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -407,438 +408,439 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3092
+#: apply.c:3117
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补�数�"
 
-#: apply.c:3100
+#: apply.c:3125
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "�能��应用一个缺少到 '%s' 的��数��的二进制补�"
 
-#: apply.c:3146
+#: apply.c:3171
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "�能在 '%s' 上应用没有完整索引行的二进制补�"
 
-#: apply.c:3156
+#: apply.c:3181
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补�应用到 '%s'（%s），但是和当�内容�匹�。"
 
-#: apply.c:3164
+#: apply.c:3189
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补�应用到空文件 '%s'，但其并�空文件"
 
-#: apply.c:3182
+#: apply.c:3207
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读� '%2$s' 必须的目标文件 %1$s"
 
-#: apply.c:3195
+#: apply.c:3220
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补�未应用到 '%s'"
 
-#: apply.c:3201
+#: apply.c:3226
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补�产生了�正确的结果（应为 %s，�为 %s）"
 
-#: apply.c:3222
+#: apply.c:3247
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补�失败：%s:%ld"
 
-#: apply.c:3344
+#: apply.c:3369
 #, c-format
 msgid "cannot checkout %s"
 msgstr "�能检出 %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读� %s"
 
-#: apply.c:3400
+#: apply.c:3426
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读��于符�链接中的 '%s'"
 
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已�被�命�/删除"
 
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在于索引中"
 
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�匹�"
 
-#: apply.c:3556
+#: apply.c:3582
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: apply.c:3559
+#: apply.c:3585
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "回�到三方�并...\n"
 
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读� '%s' 的当�内容"
 
-#: apply.c:3591
+#: apply.c:3617
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "无法回�到三方�并...\n"
 
-#: apply.c:3605
+#: apply.c:3631
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补�到 '%s' 存在冲�。\n"
 
-#: apply.c:3610
+#: apply.c:3636
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功应用补�到 '%s'。\n"
 
-#: apply.c:3636
+#: apply.c:3662
 msgid "removal patch leaves file contents"
 msgstr "移除补��留下了文件内容"
 
-#: apply.c:3708
+#: apply.c:3734
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3710
+#: apply.c:3736
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c:3918
+#: apply.c:3944
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已�存在于索引中"
 
-#: apply.c:3921
+#: apply.c:3947
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已�存在于工作区中"
 
-#: apply.c:3941
+#: apply.c:3967
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模�（%1$o）和旧模�（%3$o）�匹�"
 
-#: apply.c:3946
+#: apply.c:3972
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s 的新模�（%1$o）和 %4$s 的旧模�（%3$o）�匹�"
 
-#: apply.c:3966
+#: apply.c:3992
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影�的文件 '%s' �于符�链接中"
 
-#: apply.c:3970
+#: apply.c:3996
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补�未应用"
 
-#: apply.c:3985
+#: apply.c:4011
 #, c-format
 msgid "Checking patch %s..."
 msgstr "检查补� %s..."
 
-#: apply.c:4076
+#: apply.c:4102
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模组 %s 的 sha1 信�缺失或无效"
 
-#: apply.c:4083
+#: apply.c:4109
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模�被改�，但它�在当� HEAD 中"
 
-#: apply.c:4086
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信�缺失或无效（%s）。"
 
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry �作失败"
 
-#: apply.c:4095
+#: apply.c:4121
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在临时索引中添加 %s"
 
-#: apply.c:4105
+#: apply.c:4131
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把临时索引写入到 %s"
 
-#: apply.c:4243
+#: apply.c:4269
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能从索引中移除 %s"
 
-#: apply.c:4278
+#: apply.c:4304
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模组 %s ��的补�"
 
-#: apply.c:4284
+#: apply.c:4310
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4292
+#: apply.c:4318
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能为新建文件 %s 创建�端存储"
 
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存�目"
 
-#: apply.c:4339
+#: apply.c:4365
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "无法写入 '%s'"
 
-#: apply.c:4343
+#: apply.c:4369
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4413
+#: apply.c:4439
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能写文件 '%s' �� %o"
 
-#: apply.c:4511
+#: apply.c:4537
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功应用补� %s。"
 
-#: apply.c:4519
+#: apply.c:4545
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4522
+#: apply.c:4548
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "应用 %%s 个补�，其中 %d 个被拒�..."
 msgstr[1] "应用 %%s 个补�，其中 %d 个被拒�..."
 
-#: apply.c:4533
+#: apply.c:4559
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 #, c-format
 msgid "cannot open %s"
 msgstr "�能打开 %s"
 
-#: apply.c:4555
+#: apply.c:4581
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段�功应用。"
 
-#: apply.c:4559
+#: apply.c:4585
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒�第 #%d 个片段。"
 
-#: apply.c:4669
+#: apply.c:4695
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补� '%s'。"
 
-#: apply.c:4677
+#: apply.c:4703
 msgid "unrecognized input"
 msgstr "未能识别的输入"
 
-#: apply.c:4696
+#: apply.c:4722
 msgid "unable to read index file"
 msgstr "无法读�索引文件"
 
-#: apply.c:4833
+#: apply.c:4859
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能打开补� '%s'：%s"
 
-#: apply.c:4860
+#: apply.c:4886
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 个空白字符误用"
 msgstr[1] "抑制下�有 %d 个空白字符误用"
 
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c:4874
+#: apply.c:4900
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修�空白错误�，应用了 %d 行。"
 msgstr[1] "修�空白错误�，应用了 %d 行。"
 
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: 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
 msgid "path"
 msgstr "路径"
 
-#: apply.c:4922
+#: apply.c:4948
 msgid "don't apply changes matching the given path"
 msgstr "��应用与给出路径�匹�的�更"
 
-#: apply.c:4925
+#: apply.c:4951
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
 msgid "num"
 msgstr "æ•°å­—"
 
-#: apply.c:4928
+#: apply.c:4954
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数�的�导斜线"
 
-#: apply.c:4931
+#: apply.c:4957
 msgid "ignore additions made by the patch"
 msgstr "忽略补�中的添加的文件"
 
-#: apply.c:4933
+#: apply.c:4959
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�应用补�，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:4937
+#: apply.c:4963
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�进制数显示添加和删除的行数"
 
-#: apply.c:4939
+#: apply.c:4965
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�应用补�，而是显示输入的概�"
 
-#: apply.c:4941
+#: apply.c:4967
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�应用补�，而是查看补�是��应用"
 
-#: apply.c:4943
+#: apply.c:4969
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补��以应用到当�索引"
 
-#: apply.c:4945
+#: apply.c:4971
 msgid "apply a patch without touching the working tree"
 msgstr "应用补�而�修改工作区"
 
-#: apply.c:4947
+#: apply.c:4973
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: apply.c:4949
+#: apply.c:4975
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: apply.c:4951
+#: apply.c:4977
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "如果一个补��能应用则�试三方�并"
 
-#: apply.c:4953
+#: apply.c:4979
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:4958
+#: apply.c:4984
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 msgid "action"
 msgstr "动作"
 
-#: apply.c:4960
+#: apply.c:4986
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: apply.c:4969
+#: apply.c:4995
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: apply.c:4971
+#: apply.c:4997
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:4973
+#: apply.c:4999
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: apply.c:4975
+#: apply.c:5001
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: apply.c:4978
+#: apply.c:5004
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: apply.c:4981
+#: apply.c:5007
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:4984
+#: apply.c:5010
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件��添加 <根目录>"
 
@@ -860,108 +862,108 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹�任何文件"
 
-#: archive.c:418
+#: archive.c:436
 msgid "fmt"
 msgstr "格�"
 
-#: archive.c:418
+#: archive.c:436
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
 msgid "prefix"
 msgstr "�缀"
 
-#: archive.c:420
+#: archive.c:438
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中�个路径�加上�缀"
 
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: 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
 msgid "file"
 msgstr "文件"
 
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:424
+#: archive.c:442
 msgid "read .gitattributes in working directory"
 msgstr "读�工作区中的 .gitattributes"
 
-#: archive.c:425
+#: archive.c:443
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:426
+#: archive.c:444
 msgid "store only"
 msgstr "�存储"
 
-#: archive.c:427
+#: archive.c:445
 msgid "compress faster"
 msgstr "压缩速度更快"
 
-#: archive.c:435
+#: archive.c:453
 msgid "compress better"
 msgstr "压缩效果更好"
 
-#: archive.c:438
+#: archive.c:456
 msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）��归档文件"
 
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 msgid "command"
 msgstr "命令"
 
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:450
+#: archive.c:468
 msgid "Unexpected option --remote"
 msgstr "未知�数 --remote"
 
-#: archive.c:452
+#: archive.c:470
 msgid "Option --exec can only be used together with --remote"
 msgstr "选项 --exec �能和 --remote �时使用"
 
-#: archive.c:454
+#: archive.c:472
 msgid "Unexpected option --output"
 msgstr "未知�数 --output"
 
-#: archive.c:476
+#: archive.c:494
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格� '%s'"
 
-#: archive.c:483
+#: archive.c:501
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�数�支�此格� '%s'：-%d"
 
-#: attr.c:214
+#: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s �是一个有效的属性�"
 
-#: attr.c:410
+#: attr.c:415
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1038,31 +1040,31 @@ msgstr ""
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：�并基线必须是�过测试的\n"
 
-#: bisect.c:849
+#: bisect.c:850
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需�一个 %s 版本"
 
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
 #, c-format
 msgid "could not create file '%s'"
 msgstr "�能创建文件 '%s'"
 
-#: bisect.c:917
+#: bisect.c:918
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能读�文件 '%s'"
 
-#: bisect.c:947
+#: bisect.c:948
 msgid "reading bisect refs failed"
 msgstr "读�二分查找引用失败"
 
-#: bisect.c:967
+#: bisect.c:968
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s �时为 %s 和 %s\n"
 
-#: bisect.c:975
+#: bisect.c:976
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1071,7 +1073,7 @@ msgstr ""
 "没有�现�测试的�交。\n"
 "�能您在�行时使用了错误的路径�数？\n"
 
-#: bisect.c:994
+#: bisect.c:995
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1081,7 +1083,7 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1000
+#: bisect.c:1001
 #, 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"
@@ -1100,10 +1102,10 @@ msgstr "�能将 --contents 和最终的�交对象�共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: 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
 msgid "revision walk setup failed"
 msgstr "版本�历设置失败"
 
@@ -1141,43 +1143,43 @@ msgstr "未设置分支 %s 作为它自己的上游。"
 
 #: branch.c:93
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "分支 %1$s 设置为使用�基�跟踪�自 %3$s 的远程分支 %2$s。"
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "分支 '%1$s' 设置为使用�基�跟踪�自 '%3$s' 的远程分支 '%2$s'。"
 
 #: branch.c:94
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "分支 %1$s 设置为跟踪�自 %3$s 的远程分支 %2$s。"
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "分支 '%1$s' 设置为跟踪�自 '%3$s' 的远程分支 '%2$s'。"
 
 #: branch.c:98
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "分支 %s 设置为使用�基�跟踪本地分支 %s。"
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用�基�跟踪本地分支 '%s'。"
 
 #: branch.c:99
 #, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "分支 %s 设置为跟踪本地分支 %s。"
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
 
 #: branch.c:104
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "分支 %s 设置为使用�基�跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用�基�跟踪远程引用 '%s'。"
 
 #: branch.c:105
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "分支 %s 设置为跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
 
 #: branch.c:109
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "分支 %s 设置为使用�基�跟踪本地引用 %s。"
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用�基�跟踪本地引用 '%s'。"
 
 #: branch.c:110
 #, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "分支 %s 设置为跟踪本地引用 %s。"
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
@@ -1198,21 +1200,21 @@ msgstr "'%s' �是一个有效的分支�称。"
 msgid "A branch named '%s' already exists."
 msgstr "一个分支� '%s' 已�存在。"
 
-#: branch.c:198
+#: branch.c:197
 msgid "Cannot force update the current branch."
 msgstr "无法强制更新当�分支。"
 
-#: branch.c:218
+#: branch.c:217
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr "无法设置跟踪信�；起始点 '%s' �是一个分支。"
 
-#: branch.c:220
+#: branch.c:219
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "请求的上游分支 '%s' �存在"
 
-#: branch.c:222
+#: branch.c:221
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1230,22 +1232,22 @@ msgstr ""
 "如果您正计划推�一个能与对应远程分支建立跟踪的新的本地分支，\n"
 "您�能需�使用 \"git push -u\" 推�分支并�置和上游的关�。"
 
-#: branch.c:265
+#: branch.c:264
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "�是一个有效的对象�：'%s'。"
 
-#: branch.c:285
+#: branch.c:284
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "歧义的对象�：'%s'。"
 
-#: branch.c:290
+#: branch.c:289
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "无效的分支点：'%s'。"
 
-#: branch.c:344
+#: branch.c:343
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已�检出到 '%s'"
@@ -1265,7 +1267,9 @@ msgstr "'%s' ��是一个 v2 版本的包文件"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: 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
 #, c-format
 msgid "could not open '%s'"
 msgstr "�能打开 '%s'"
@@ -1274,56 +1278,56 @@ msgstr "�能打开 '%s'"
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的�交："
 
-#: bundle.c:186
+#: bundle.c:193
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "这个包中�有这个引用："
 msgstr[1] "这个包中�有 %d 个引用："
 
-#: bundle.c:193
+#: bundle.c:200
 msgid "The bundle records a complete history."
 msgstr "这个包记录一个完整历�。"
 
-#: bundle.c:195
+#: bundle.c:202
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "这个包需�这个引用："
 msgstr[1] "这个包需� %d 个引用："
 
-#: bundle.c:254
+#: bundle.c:261
 msgid "Could not spawn pack-objects"
 msgstr "�能生� pack-objects 进程"
 
-#: bundle.c:265
+#: bundle.c:272
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:307
+#: bundle.c:314
 msgid "rev-list died"
 msgstr "rev-list 终止"
 
-#: bundle.c:356
+#: bundle.c:363
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
 
-#: bundle.c:454
+#: bundle.c:461
 msgid "Refusing to create empty bundle."
 msgstr "�能创建空包。"
 
-#: bundle.c:466
+#: bundle.c:473
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能创建 '%s'"
 
-#: bundle.c:494
+#: bundle.c:501
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
@@ -1332,8 +1336,8 @@ msgstr "index-pack 终止"
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
 #, c-format
 msgid "could not parse %s"
 msgstr "�能解� %s"
@@ -1343,7 +1347,7 @@ msgstr "�能解� %s"
 msgid "%s %s is not a commit!"
 msgstr "%s %s �是一个�交!"
 
-#: commit.c:1511
+#: commit.c:1517
 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"
@@ -1357,152 +1361,152 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: config.c:186
+#: config.c:187
 msgid "relative config include conditionals must come from files"
 msgstr "包�相对路径的�件引用必须�自于文件"
 
-#: config.c:720
+#: config.c:721
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:724
+#: config.c:725
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的�置行 %1$d"
 
-#: config.c:728
+#: config.c:729
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的�置行 %d"
 
-#: config.c:732
+#: config.c:733
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "�模组数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:736
+#: config.c:737
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的�置行 %1$d"
 
-#: config.c:740
+#: config.c:741
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的�置行 %1$d"
 
-#: config.c:868
+#: config.c:869
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c:868
+#: config.c:869
 msgid "invalid unit"
 msgstr "无效的��"
 
-#: config.c:874
+#: config.c:875
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "�置�� '%2$s' 的数字�值 '%1$s' 设置错误：%3$s"
 
-#: config.c:879
+#: config.c:880
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "数�对象 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:882
+#: config.c:883
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "文件 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:885
+#: config.c:886
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中�置�� '%2$s' 错误的�值 '%1$s'：%3$s"
 
-#: config.c:888
+#: config.c:889
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "�模组数� %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:891
+#: config.c:892
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "命令行 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:894
+#: config.c:895
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:989
+#: config.c:990
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展 '%s' 中的用户目录"
 
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1212
+#: config.c:1213
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1368
+#: config.c:1372
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1564
+#: config.c:1568
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:1894
+#: config.c:1900
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
-#: config.c:2064
+#: config.c:2087
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2085
+#: config.c:2130
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "未知的 core.untrackedCache �值 '%s'，使用默认值 'keep'"
 
-#: config.c:2111
+#: config.c:2156
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2122
+#: config.c:2167
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解�命令行�置中的 '%s'"
 
-#: config.c:2124
+#: config.c:2169
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行�现错误的�置�� '%1$s'"
 
-#: config.c:2183
+#: config.c:2228
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:2635
+#: config.c:2678
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
 #, c-format
 msgid "could not unset '%s'"
 msgstr "�能�消设置 '%s'"
@@ -1522,19 +1526,19 @@ msgstr ""
 "\n"
 "请确认您有正确的访问��并且仓库存在。"
 
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "检查连接中"
 
-#: connected.c:75
+#: connected.c:76
 msgid "Could not run 'git rev-list'"
 msgstr "�能执行 'git rev-list'"
 
-#: connected.c:95
+#: connected.c:96
 msgid "failed write to rev-list"
 msgstr "无法写入 rev-list"
 
-#: connected.c:102
+#: connected.c:103
 msgid "failed to close rev-list's stdin"
 msgstr "无法关闭 rev-list 的标准输入"
 
@@ -1643,29 +1647,35 @@ msgstr "无法读�排�文件 '%s'"
 msgid "Performing inexact rename detection"
 msgstr "正在进行�精确的�命�探测"
 
-#: diff.c:63
+#: diff.c:74
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "选项 '%s'  需�一个值"
 
 #  译者：注����导空格
-#: diff.c:125
+#: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注����导空格
-#: diff.c:130
+#: diff.c:157
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �数 '%s'\n"
 
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr "代�移动的颜色设置必须是 'no'�'default'�'zebra'�'dimmed_zebra' 或 'plain'"
+
+#: diff.c:341
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�置�� 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:342
+#: diff.c:398
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1674,20 +1684,20 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:3101
+#: diff.c:3861
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:3427
+#: diff.c:4189
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
 
-#: diff.c:3517
+#: diff.c:4279
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确�求�跟一个路径规格"
 
-#: diff.c:3680
+#: diff.c:4445
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1696,226 +1706,230 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:3694
+#: diff.c:4459
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: diff.c:4716
+#: diff.c:5505
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因为文件太多，略过�严格的�命�检查。"
 
-#: diff.c:4719
+#: diff.c:5508
 msgid "only found copies from modified paths due to too many files."
 msgstr "因为文件太多，�在修改的路径中查找拷�。"
 
-#: diff.c:4722
+#: diff.c:5511
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您�能想�将�� %s 设置为至少 %d 并�次执行此命令。"
 
-#: dir.c:1948
+#: dir.c:1983
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2067
+#: dir.c:2102
 msgid "Untracked cache is disabled on this system or location."
 msgstr "缓存未跟踪文件在本系统或�置中被�用。"
 
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能为 %s 创建目录"
 
-#: dir.c:2876
+#: dir.c:2915
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能从 '%s' �移 git 目录到 '%s'"
 
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "过滤内容"
+
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "�能对文件 '%s' 调用 stat"
 
-#: fetch-pack.c:251
+#: fetch-pack.c:252
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:263
+#: fetch-pack.c:264
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack：应为 ACK/NAK，�得到 EOF"
 
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:284
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，�得到 '%s'"
 
-#: fetch-pack.c:335
+#: fetch-pack.c:336
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需� multi_ack_detailed"
 
-#: fetch-pack.c:421
+#: fetch-pack.c:422
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信�：%s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:428
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信�：%s"
 
-#: fetch-pack.c:429
+#: fetch-pack.c:430
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:433
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:435
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未�现 shallow：%s"
 
-#: fetch-pack.c:437
+#: fetch-pack.c:438
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:476
+#: fetch-pack.c:477
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:490
+#: fetch-pack.c:491
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效�交 %s"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:545
+#: fetch-pack.c:546
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:591
+#: fetch-pack.c:592
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完�"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:776
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已�有 %s（%s）"
 
-#: fetch-pack.c:813
+#: fetch-pack.c:814
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:822
 msgid "protocol error: bad pack header"
 msgstr "�议错误：�的包头"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:878
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:893
+#: fetch-pack.c:894
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:895
+#: fetch-pack.c:896
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:922
+#: fetch-pack.c:923
 msgid "Server does not support shallow clients"
 msgstr "�务器�支� shalllow 客户端"
 
-#: fetch-pack.c:926
+#: fetch-pack.c:927
 msgid "Server supports multi_ack_detailed"
 msgstr "�务器支� multi_ack_detailed"
 
-#: fetch-pack.c:929
+#: fetch-pack.c:930
 msgid "Server supports no-done"
 msgstr "�务器支� no-done"
 
-#: fetch-pack.c:935
+#: fetch-pack.c:936
 msgid "Server supports multi_ack"
 msgstr "�务器支� multi_ack"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:940
 msgid "Server supports side-band-64k"
 msgstr "�务器支� side-band-64k"
 
-#: fetch-pack.c:943
+#: fetch-pack.c:944
 msgid "Server supports side-band"
 msgstr "�务器支� side-band"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:948
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "�务器支� allow-tip-sha1-in-want"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:952
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "�务器支� allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:962
 msgid "Server supports ofs-delta"
 msgstr "�务器支� ofs-delta"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:969
 #, c-format
 msgid "Server version is %.*s"
 msgstr "�务器版本 %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:975
 msgid "Server does not support --shallow-since"
 msgstr "�务器�支� --shallow-since"
 
-#: fetch-pack.c:978
+#: fetch-pack.c:979
 msgid "Server does not support --shallow-exclude"
 msgstr "�务器�支� --shallow-exclude"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:981
 msgid "Server does not support --deepen"
 msgstr "�务器�支� --deepen"
 
-#: fetch-pack.c:991
+#: fetch-pack.c:992
 msgid "no common commits"
 msgstr "没有共�的�交"
 
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获�失败。"
 
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
 msgid "no matching remote head"
 msgstr "没有匹�的远程分支"
 
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "�务器��许请求未公开的对象 %s"
@@ -1928,7 +1942,7 @@ msgstr "gpg 无法为数�签�"
 msgid "could not create temporary file"
 msgstr "�能创建临时文件"
 
-#: gpg-interface.c:213
+#: gpg-interface.c:214
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离�签�写入 '%s'"
@@ -1938,17 +1952,17 @@ msgstr "无法将分离�签�写入 '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c:1981
+#: grep.c:1970
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "对 '%s' 调用 stat 失败"
 
-#: grep.c:2009
+#: grep.c:1998
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读��完整"
@@ -2006,8 +2020,12 @@ msgid ""
 msgid_plural ""
 "\n"
 "The most similar commands are"
-msgstr[0] "\n最相似的命令是"
-msgstr[1] "\n最相似的命令是"
+msgstr[0] ""
+"\n"
+"最相似的命令是"
+msgstr[1] ""
+"\n"
+"最相似的命令是"
 
 #: help.c:395
 msgid "git version [<options>]"
@@ -2085,12 +2103,12 @@ msgstr "��许空的姓�（对于 <%s>）"
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓�中仅包��用字符：%s"
 
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格�：%s"
 
-#: lockfile.c:152
+#: lockfile.c:151
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2108,7 +2126,7 @@ msgstr ""
 "�能之�有一个 git 进程在这个仓库中异常退出：\n"
 "手动删除这个文件�继续。"
 
-#: lockfile.c:160
+#: lockfile.c:159
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "�能创建 '%s.lock'：%s"
@@ -2117,78 +2135,78 @@ msgstr "�能创建 '%s.lock'：%s"
 msgid "failed to read the cache"
 msgstr "无法读�缓存"
 
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
-#: merge-recursive.c:210
+#: merge-recursive.c:235
 msgid "(bad commit)\n"
 msgstr "（��交）\n"
 
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "为路径 '%s' addinfo_cache 失败"
 
-#: merge-recursive.c:304
+#: merge-recursive.c:329
 msgid "error building trees"
 msgstr "无法创建树"
 
-#: merge-recursive.c:728
+#: merge-recursive.c:752
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "无法创建路径 '%s'%s"
 
-#: merge-recursive.c:739
+#: merge-recursive.c:763
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为�目录留出空间\n"
 
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
 msgid ": perhaps a D/F conflict?"
 msgstr "：�能是一个目录/文件冲�？"
 
-#: merge-recursive.c:762
+#: merge-recursive.c:786
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒�丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "�能读�对象 %s '%s'"
 
-#: merge-recursive.c:806
+#: merge-recursive.c:830
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数�对象"
 
-#: merge-recursive.c:830
+#: merge-recursive.c:854
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "无法打开 '%s'：%s"
 
-#: merge-recursive.c:841
+#: merge-recursive.c:865
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "无法创建符�链接 '%s'：%s"
 
-#: merge-recursive.c:846
+#: merge-recursive.c:870
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "�知�如何处� %06o %s '%s'"
 
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
 msgid "Failed to execute internal merge"
 msgstr "无法执行内部�并"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�能添加 %s 至对象库"
 
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2197,7 +2215,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被�留。"
 
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2206,7 +2224,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被�留。"
 
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2215,7 +2233,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本�留在 %8$s 中。"
 
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2224,20 +2242,20 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本�留在 %9$s 中。"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "rename"
 msgstr "�命�"
 
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
 msgid "renamed"
 msgstr "�命�"
 
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为�被添加"
 
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2246,139 +2264,139 @@ msgstr ""
 "冲�（�命�/�命�）：在分支 \"%3$s\" 中�命� \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中�命� \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
 #, 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:1326
+#: merge-recursive.c:1350
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "而是�命� %s 至 %s，以� %s 至 %s"
 
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
 #, 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:1544
+#: merge-recursive.c:1568
 #, c-format
 msgid "Adding merged %s"
 msgstr "添加�并�的 %s"
 
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为�添加"
 
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
 #, c-format
 msgid "cannot read object %s"
 msgstr "�能读�对象 %s"
 
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
 #, c-format
 msgid "object %s is not a blob"
 msgstr "对象 %s �是一个数�对象"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
 msgid "content"
 msgstr "内容"
 
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已��过相��并）"
 
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动�并 %s"
 
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
 msgid "submodule"
 msgstr "�模组"
 
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲�（%s）：�并冲�于 %s"
 
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
 #, 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:1893
+#: merge-recursive.c:1917
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
 msgstr "已�是最新的�"
 
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法�并树 %s 和 %s"
 
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
 msgid "Merging:"
 msgstr "�并："
 
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "�现 %u 个共�祖先："
 msgstr[1] "�现 %u 个共�祖先："
 
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
 msgid "merge returned no commit"
 msgstr "�并未返回�交"
 
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
 msgid "Unable to write index."
 msgstr "�能写入索引。"
 
-#: notes-merge.c:273
+#: notes-merge.c:272
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -2389,7 +2407,7 @@ msgstr ""
 "在开始一个新的注释�并之�，请使用 'git notes merge --commit' 或者 'git "
 "notes merge --abort' ��交/终止�一次�并。"
 
-#: notes-merge.c:280
+#: notes-merge.c:279
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "您尚未结�注释�并（存在 %s）。"
@@ -2417,16 +2435,30 @@ msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
 msgid "Bad %s value: '%s'"
 msgstr "�的 %s 值：'%s'"
 
-#: object.c:240
+#: object.c:239
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "�能解�对象：%s"
 
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "�移�在包文件结�之�（��的 .idx？）"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "�移�越过了 %s 的包索引的结尾（被截断的索引？）"
+
 #: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:591
+#: parse-options.c:592
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -2434,18 +2466,18 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:597
+#: parse-options.c:598
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:600
+#: parse-options.c:601
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:634
+#: parse-options.c:640
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
@@ -2454,7 +2486,7 @@ msgstr "-æ•°å­—"
 msgid "malformed object name '%s'"
 msgstr "�法的对象� '%s'"
 
-#: path.c:890
+#: path.c:891
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�能设置 %s 为组�写"
@@ -2525,7 +2557,7 @@ msgstr "'%s'（助记符：'%c'）"
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇�缀�被此命令支�：%s"
 
-#: pathspec.c:575
+#: 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"
@@ -2533,12 +2565,12 @@ msgstr ""
 "在下一个版本中，使用空字符串作为路径规格将被视作�法。如果�匹�所有路径，\n"
 "请代之以 ."
 
-#: pathspec.c:599
+#: pathspec.c:595
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' �于符�链接中"
 
-#: pretty.c:963
+#: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
@@ -2560,50 +2592,51 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能关闭 '%s'"
 
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: read-cache.c:2396
+#: read-cache.c:2407
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能打开 git 目录：%s"
 
-#: read-cache.c:2408
+#: read-cache.c:2419
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: refs.c:622
+#: refs.c:638
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: refs.c:1769
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中�止更新引用"
 
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "无法删除引用 %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
-
 #: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "丢失"
@@ -2633,147 +2666,147 @@ msgstr "期望的格�：%%(color:<color>)"
 msgid "unrecognized color: %%(color:%s)"
 msgstr "未能识别的颜色：%%(color:%s)"
 
-#: ref-filter.c:121
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整数值 refname:lstrip=%s"
 
-#: ref-filter.c:125
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c:127
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "未能识别的 %%(%s) �数：%s"
 
-#: ref-filter.c:167
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �带�数"
 
-#: ref-filter.c:174
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) �带�数"
 
-#: ref-filter.c:181
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) �带�数"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) �数：%s"
 
-#: ref-filter.c:200
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c:202
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "未能识别的 %%(contents) �数：%s"
 
-#: ref-filter.c:215
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "期望一个正数 objectname:short=%s"
 
-#: ref-filter.c:219
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "未能识别的 %%(objectname) �数：%s"
 
-#: ref-filter.c:246
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格�：%%(align:<width>,<position>)"
 
-#: ref-filter.c:258
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "未能识别的�置：%s"
 
-#: ref-filter.c:262
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c:268
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "未能识别的 %%(align) �数：%s"
 
-#: ref-filter.c:272
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一个正数的宽度"
 
-#: ref-filter.c:287
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "未能识别的 %%(if) �数：%s"
 
-#: ref-filter.c:378
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "�法的字段�：%.*s"
 
-#: ref-filter.c:404
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的字段�：%.*s"
 
-#: ref-filter.c:508
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "格�：使用了 %%(if) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:568
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "格�：使用了 %%(then) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:570
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格�：%%(then) 元素用了多次"
 
-#: ref-filter.c:572
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之�"
 
-#: ref-filter.c:598
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "格�：使用了 %%(else) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:600
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "格�：使用了 %%(else) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:602
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格�：%%(else) 元素用了多次"
 
-#: ref-filter.c:615
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格�：使用了 %%(end) 元素�没有它的对应元素"
 
-#: ref-filter.c:670
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "�法的格�化字符串 %s"
 
-#: ref-filter.c:1254
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（�分支，正�基 %s）"
 
-#: ref-filter.c:1257
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（�分支，二分查找开始于 %s）"
@@ -2781,7 +2814,7 @@ msgstr "（�分支，二分查找开始于 %s）"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针分离于 %s）"
@@ -2789,108 +2822,108 @@ msgstr "（头指针分离于 %s）"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针分离自 %s）"
 
-#: ref-filter.c:1276
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "（�分支）"
 
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:1760
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "�法的对象于 '%s'"
 
-#: ref-filter.c:1827
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误�称 %s 的引用"
 
-#: ref-filter.c:1832
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略��的引用 %s"
 
-#: ref-filter.c:2095
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2176
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "�法的对象� %s"
 
-#: remote.c:747
+#: remote.c:750
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�时获� %s 和 %s 至 %s"
 
-#: remote.c:751
+#: remote.c:754
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而� %s"
 
-#: remote.c:755
+#: remote.c:758
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �时跟踪 %s 和 %s"
 
-#: remote.c:763
+#: remote.c:766
 msgid "Internal error"
 msgstr "内部错误"
 
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指�一个分支"
 
-#: remote.c:1689
+#: remote.c:1690
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1692
+#: remote.c:1693
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1698
+#: remote.c:1699
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1713
+#: remote.c:1714
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1725
+#: remote.c:1726
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置�推�的远程�务器"
 
-#: remote.c:1736
+#: remote.c:1737
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用规格未包� '%s'"
 
-#: remote.c:1749
+#: remote.c:1750
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�无目标（push.default 是 'nothing'）"
 
-#: remote.c:1771
+#: remote.c:1772
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解� 'simple' 推�至一个�独的目标"
 
@@ -2905,7 +2938,7 @@ msgstr "  （使用 \"git branch --unset-upstream\" �修�）\n"
 
 #: remote.c:2083
 #, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
 #: remote.c:2087
@@ -2952,16 +2985,16 @@ msgstr[1] ""
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" ��并远程分支）\n"
 
-#: revision.c:2187
+#: revision.c:2256
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2190
+#: revision.c:2259
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2384
+#: revision.c:2453
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 与 --bisect �兼容"
 
@@ -3001,24 +3034,24 @@ msgstr "接收端�支�原�推�"
 msgid "the receiving end does not support push options"
 msgstr "接收端�支�推�选项"
 
-#: sequencer.c:216
+#: sequencer.c:218
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:218
+#: sequencer.c:220
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:220
+#: sequencer.c:222
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:222
+#: sequencer.c:224
 #, c-format
 msgid "Unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:279
+#: sequencer.c:281
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3026,7 +3059,7 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正�的文件"
 
-#: sequencer.c:282
+#: sequencer.c:284
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3035,42 +3068,43 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正�的文件�标记，然�用 'git commit' �交"
 
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能�定 '%s'"
 
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
 #, c-format
 msgid "could not write to '%s'"
 msgstr "�能写入 '%s'"
 
-#: sequencer.c:302
+#: sequencer.c:304
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "�能将�行符写入 '%s'"
 
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "无法完� '%s'。"
 
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
 #, c-format
 msgid "could not read '%s'"
 msgstr "�能读� '%s'"
 
-#: sequencer.c:356
+#: sequencer.c:358
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:360
+#: sequencer.c:362
 msgid "commit your changes or stash them to proceed."
 msgstr "�交您的修改或贮���继续。"
 
-#: sequencer.c:389
+#: sequencer.c:391
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
@@ -3078,20 +3112,20 @@ msgstr "%s：快进"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
-#: sequencer.c:472
+#: sequencer.c:474
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:491
+#: sequencer.c:493
 msgid "could not resolve HEAD commit\n"
 msgstr "�能解� HEAD �交\n"
 
-#: sequencer.c:511
+#: sequencer.c:513
 msgid "unable to update cache tree\n"
 msgstr "�能更新缓存树\n"
 
-#: sequencer.c:595
+#: sequencer.c:597
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3120,17 +3154,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:697
+#: sequencer.c:699
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "�能解��交 %s\n"
 
-#: sequencer.c:702
+#: sequencer.c:704
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "�能解�父�交 %s\n"
 
-#: sequencer.c:824
+#: sequencer.c:826
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3141,7 +3175,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:830
+#: sequencer.c:832
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3152,230 +3186,231 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个�交的组�。"
 
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
 msgid "need a HEAD to fixup"
 msgstr "需�一个 HEAD �修�"
 
-#: sequencer.c:847
+#: sequencer.c:849
 msgid "could not read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:849
+#: sequencer.c:851
 msgid "could not read HEAD's commit message"
 msgstr "�能读� HEAD 的�交说明"
 
-#: sequencer.c:855
+#: sequencer.c:857
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能写 '%s'"
 
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
 msgid "This is the 1st commit message:"
 msgstr "这是第一个�交说明："
 
-#: sequencer.c:872
+#: sequencer.c:874
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能读� %s 的�交说明"
 
-#: sequencer.c:879
+#: sequencer.c:881
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是�交说明 #%d："
 
-#: sequencer.c:884
+#: sequencer.c:886
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "�交说明 #%d 将被跳过："
 
-#: sequencer.c:889
+#: sequencer.c:891
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:955
+#: sequencer.c:957
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完��并。"
 
-#: sequencer.c:973
+#: sequencer.c:975
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一个�并�交但未�供 -m 选项。"
 
-#: sequencer.c:981
+#: sequencer.c:983
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 没有第 %d 个父�交"
 
-#: sequencer.c:985
+#: sequencer.c:987
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "指定了主线，但是�交 %s �是一个�并�交。"
 
-#: sequencer.c:991
+#: sequencer.c:993
 #, 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:1012
+#: sequencer.c:1014
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能将 '%s' �命�为 '%s'"
 
-#: sequencer.c:1126
+#: sequencer.c:1128
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能还原 %s... %s"
 
-#: sequencer.c:1127
+#: sequencer.c:1129
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能应用 %s... %s"
 
-#: sequencer.c:1169
+#: sequencer.c:1171
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:1179
+#: sequencer.c:1181
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读�索引"
 
-#: sequencer.c:1186
+#: sequencer.c:1188
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:1306
+#: sequencer.c:1308
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:1314
+#: sequencer.c:1316
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父�交的情况下�能 '%s'"
 
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
 #, c-format
 msgid "could not read '%s'."
 msgstr "�能读� '%s'。"
 
-#: sequencer.c:1359
+#: sequencer.c:1361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' �修改。"
 
-#: sequencer.c:1361
+#: sequencer.c:1363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清�：'%s'"
 
-#: sequencer.c:1366
+#: sequencer.c:1368
 msgid "no commits parsed."
 msgstr "没有解��交。"
 
-#: sequencer.c:1377
+#: sequencer.c:1379
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在回退中执行拣选。"
 
-#: sequencer.c:1379
+#: sequencer.c:1381
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在拣选中执行回退。"
 
-#: sequencer.c:1442
+#: sequencer.c:1448
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键�：%s"
 
-#: sequencer.c:1445
+#: sequencer.c:1451
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:1502
+#: sequencer.c:1517
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "�法的选项清�：'%s'"
 
-#: sequencer.c:1540
+#: sequencer.c:1555
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原�作已在进行"
 
-#: sequencer.c:1541
+#: sequencer.c:1556
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "�试 \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1544
+#: sequencer.c:1559
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能创建�列目录 '%s'"
 
-#: sequencer.c:1558
+#: sequencer.c:1574
 msgid "could not lock HEAD"
 msgstr "�能�定 HEAD"
 
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
-#: sequencer.c:1616
+#: sequencer.c:1634
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能打开 '%s'"
 
-#: sequencer.c:1640
+#: sequencer.c:1659
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能读� '%s'：%s"
 
-#: sequencer.c:1641
+#: sequencer.c:1660
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:1647
+#: sequencer.c:1666
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:1658
+#: sequencer.c:1677
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移动了 HEAD。未能回退，检查您的 HEAD�"
 
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
 msgid "cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: sequencer.c:1851
+#: sequencer.c:1874
 msgid "could not read index"
 msgstr "�能读�索引"
 
 #  译者：注����导空格
-#: sequencer.c:1856
+#: sequencer.c:1879
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3390,11 +3425,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1862
+#: sequencer.c:1885
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:1868
+#: sequencer.c:1891
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3411,17 +3446,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1925
+#: sequencer.c:1948
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已应用 autostash。\n"
 
-#: sequencer.c:1937
+#: sequencer.c:1960
 #, c-format
 msgid "cannot store %s"
 msgstr "�能存储 %s"
 
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3432,57 +3467,57 @@ msgstr ""
 "您的修改安全地�存在贮�区中。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:2022
+#: sequencer.c:2045
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:2064
+#: sequencer.c:2087
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:2094
+#: sequencer.c:2117
 msgid "could not read orig-head"
 msgstr "�能读� orig-head"
 
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
 msgid "could not read 'onto'"
 msgstr "�能读� 'onto'"
 
-#: sequencer.c:2106
+#: sequencer.c:2129
 #, c-format
 msgid "could not update %s"
 msgstr "�能更新 %s"
 
-#: sequencer.c:2113
+#: sequencer.c:2136
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 为 %s"
 
-#: sequencer.c:2197
+#: sequencer.c:2220
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�基：您有未暂存的�更。"
 
-#: sequencer.c:2202
+#: sequencer.c:2225
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:2211
+#: sequencer.c:2234
 msgid "cannot amend non-existing commit"
 msgstr "�能修补�存在的�交"
 
-#: sequencer.c:2213
+#: sequencer.c:2236
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:2215
+#: sequencer.c:2238
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:2218
+#: sequencer.c:2241
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3491,24 +3526,108 @@ msgstr ""
 "\n"
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: sequencer.c:2228
+#: sequencer.c:2251
 msgid "could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: sequencer.c:2308
+#: sequencer.c:2331
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:2312
+#: sequencer.c:2335
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:2345
+#: sequencer.c:2368
 msgid "can't revert as initial commit"
 msgstr "�能作为�始�交回退"
 
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能处�的选项"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script：准备版本时错误"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "��用的待办列表：'%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "无法以写入方�打开 '%s'"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些�交�能被�外丢弃。\n"
+"丢弃的�交（从新到旧）：\n"
+
+#: sequencer.c:2648
+#, 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"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"为��这�信�，使用 \"drop\" 指令显�地删除一个�交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' �修改警告级别。\n"
+"�选值有：ignore�warn�error。\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"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 ""
+"您�以用 'git rebase --edit-todo' 修正，然�执行 'git rebase --continue'。\n"
+"或者您�以用 'git rebase --abort' 终止�基。\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "�能解��交 '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "无法截断 '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "脚本已��新编排。"
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "无法结� '%s'"
+
 #: setup.c:171
 #, c-format
 msgid ""
@@ -3540,34 +3659,34 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 
-#: setup.c:504
+#: setup.c:499
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，�得到 %d"
 
-#: setup.c:512
+#: setup.c:507
 msgid "unknown repository extensions found:"
 msgstr "�现未知的仓库扩展："
 
-#: setup.c:810
+#: setup.c:806
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "�是一个 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
 msgid "Cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: setup.c:1050
+#: setup.c:1046
 msgid "Unable to read current working directory"
 msgstr "�能读�当�工作目录"
 
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1081
+#: setup.c:1077
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3576,7 +3695,7 @@ msgstr ""
 "�是一个 git 仓库（或者�上递归至挂载点 %s 的任何祖先目录）\n"
 "�止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1173
+#: setup.c:1159
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3585,55 +3704,41 @@ msgstr ""
 "�数 core.sharedRepository 的文件��值有错（0%.3o）。\n"
 "文件属主必须始终拥有读写��。"
 
-#: sha1_file.c:560
+#: sha1_file.c:528
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' �存在"
 
-#: sha1_file.c:586
+#: sha1_file.c:554
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
 
-#: sha1_file.c:592
+#: sha1_file.c:560
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "�考仓库 '%s' �是一个本地仓库。"
 
-#: sha1_file.c:598
+#: sha1_file.c:566
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "�考仓库 '%s' 是一个浅克隆"
 
-#: sha1_file.c:606
+#: sha1_file.c:574
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "�考仓库 '%s' 已被�接"
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "�移�在包文件结�之�（��的 .idx？）"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "�移�越过了 %s 的包索引的结尾（被截断的索引？）"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "短 SHA1 %s 存在歧义"
 
-#: sha1_name.c:430
+#: sha1_name.c:431
 msgid "The candidates are:"
 msgstr "候选者有："
 
-#: sha1_name.c:589
+#: sha1_name.c:590
 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"
@@ -3654,81 +3759,86 @@ msgstr ""
 "�能需�删除它们。用 \"git config advice.objectNameWarning false\"\n"
 "命令关闭本消�通知。"
 
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "无法修改未�并的 .gitmodules，先解决�并冲�"
 
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "无法在 .gitmodules 中找到 path=%s 的�节"
 
-#: submodule.c:82
+#: submodule.c:105
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "�能更新 .gitmodules �目 %s"
 
-#: submodule.c:115
+#: submodule.c:138
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "无法移除 %s 的 .gitmodules �目"
 
-#: submodule.c:126
+#: submodule.c:149
 msgid "staging updated .gitmodules failed"
 msgstr "将更新� .gitmodules 添加暂存区失败"
 
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs ��许为负值"
-
-#: submodule.c:376
+#: submodule.c:309
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "�于未检出的�模组 '%s'"
 
-#: submodule.c:407
+#: submodule.c:340
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "路径规格 '%s' 在�模组 '%.*s' 中"
 
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "�模组�目 '%s'（%s）是一个 %s，�是一个�交"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解�为有效引用。"
+
+#: submodule.c:1304
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "无法将 '%s' 识别为一个 git 仓库"
 
-#: submodule.c:1475
+#: submodule.c:1442
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中�动 'git status'"
 
-#: submodule.c:1488
+#: submodule.c:1455
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中执行 'git status'"
 
-#: submodule.c:1581
+#: submodule.c:1548
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "�模组 '%s' 中有�索引"
 
-#: submodule.c:1845
+#: submodule.c:1809
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "�支�对有多个工作区的�模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "�能查询�模组 '%s' 的�称"
 
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: submodule.c:1864
+#: submodule.c:1828
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3739,101 +3849,105 @@ msgstr ""
 "'%s' �移至\n"
 "'%s'\n"
 
-#: submodule.c:1948
+#: submodule.c:1912
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进�模组路径 '%s'"
 
-#: submodule.c:1992
+#: submodule.c:1956
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中�动 ls-files"
 
-#: submodule.c:2012
+#: submodule.c:1976
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG：返回的路径和当�路径�匹�？"
 
-#: submodule.c:2031
+#: submodule.c:1995
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
 
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs ��许为负值"
+
+#: submodule-config.c:436
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s 的值无效"
 
-#: trailer.c:241
+#: trailer.c:238
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "执行 trailer 命令 '%s' 失败"
 
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: 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 "键 '%2$s' 的未知�值 '%1$s'"
 
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "多于一个 %s"
 
-#: trailer.c:703
+#: trailer.c:730
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "签� '%.*s' 的键为空"
 
-#: trailer.c:723
+#: trailer.c:750
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "�能读�输入文件 '%s'"
 
-#: trailer.c:726
+#: trailer.c:753
 msgid "could not read from stdin"
 msgstr "�能自标准输入读�"
 
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
 #, c-format
 msgid "could not stat %s"
 msgstr "�能对 %s 调用 stat"
 
-#: trailer.c:952
+#: trailer.c:1010
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "文件 %s �是一个正规文件"
 
-#: trailer.c:954
+#: trailer.c:1012
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "文件 %s 用户��写"
 
-#: trailer.c:966
+#: trailer.c:1024
 msgid "could not open temporary file"
 msgstr "�能打开临时文件"
 
-#: trailer.c:1002
+#: trailer.c:1064
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "�能�命�临时文件为 %s"
 
-#: transport.c:63
+#: transport.c:62
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "将�设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
 
-#: transport.c:152
+#: transport.c:151
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c:890
+#: transport.c:888
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列�模组路径所包�的修改在任何远程�中都找�到：\n"
 
-#: transport.c:894
+#: transport.c:892
 #, c-format
 msgid ""
 "\n"
@@ -3860,7 +3974,7 @@ msgstr ""
 "以推�至远程。\n"
 "\n"
 
-#: transport.c:902
+#: transport.c:900
 msgid "Aborting."
 msgstr "正在终止。"
 
@@ -3881,11 +3995,11 @@ msgstr "树对象中的�目模�错误"
 msgid "empty filename in tree entry"
 msgstr "树对象�目中空的文件�"
 
-#: tree-walk.c:113
+#: tree-walk.c:114
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:105
+#: unpack-trees.c:106
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3894,7 +4008,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s请在切�分支��交或贮�您的修改。"
 
-#: unpack-trees.c:107
+#: unpack-trees.c:108
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3903,7 +4017,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:111
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3912,7 +4026,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"
@@ -3921,7 +4035,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:116
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3930,7 +4044,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %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"
@@ -3939,7 +4053,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3948,7 +4062,7 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:126
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3957,7 +4071,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"
@@ -3966,7 +4080,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3975,7 +4089,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"
@@ -3984,7 +4098,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:137
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3993,7 +4107,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4002,7 +4116,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4012,7 +4126,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s请在切�分支�移动或删除。"
 
-#: unpack-trees.c:145
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4022,7 +4136,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4031,7 +4145,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"
@@ -4040,7 +4154,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:153
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4049,7 +4163,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4058,21 +4172,21 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:163
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "�目 '%s' 和 '%s' ��。无法�并。"
 
-#: unpack-trees.c:165
+#: unpack-trees.c:166
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 "无法更新稀�检出：如下�目�是最新：\n"
 "%s"
 
-#: unpack-trees.c:167
+#: unpack-trees.c:168
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4082,7 +4196,7 @@ msgstr ""
 "工作区中下列文件将被稀�检出更新所覆盖：\n"
 "%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4092,7 +4206,7 @@ msgstr ""
 "工作区中下列文件将被稀�检出更新所删除：\n"
 "%s"
 
-#: unpack-trees.c:171
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4101,17 +4215,12 @@ msgstr ""
 "无法更新�模组：\n"
 "%s"
 
-#: unpack-trees.c:248
+#: unpack-trees.c:249
 #, c-format
 msgid "Aborting\n"
 msgstr "终止中\n"
 
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "�模组 %s �支��模组更新策略"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
 msgid "Checking out files"
 msgstr "正在检出文件"
 
@@ -4154,13 +4263,8 @@ msgstr "无法读� '%s'"
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读�"
@@ -4184,212 +4288,212 @@ msgstr "�能写入 %s"
 msgid "could not close %s"
 msgstr "�能关闭 %s"
 
-#: wt-status.c:152
+#: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr "未�并的路径："
 
 #  译者：注����导空格
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <文件>...\" 以�消暂存）"
 
 #  译者：注����导空格
-#: wt-status.c:185
+#: wt-status.c:183
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 
 #  译者：注����导空格
-#: wt-status.c:189
+#: wt-status.c:187
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
 #  译者：注����导空格
-#: wt-status.c:222
+#: wt-status.c:220
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:224
+#: wt-status.c:222
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <文件>...\" 更新��交的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:225
+#: wt-status.c:223
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
 
 #  译者：注����导空格
-#: wt-status.c:227
+#: wt-status.c:225
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （�交或丢弃�模组中未跟踪或修改的内容）"
 
 #  译者：注����导空格
-#: wt-status.c:239
+#: wt-status.c:237
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包���交的内容）"
 
-#: wt-status.c:254
+#: wt-status.c:252
 msgid "both deleted:"
 msgstr "�方删除："
 
-#: wt-status.c:256
+#: wt-status.c:254
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c:258
+#: wt-status.c:256
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c:260
+#: wt-status.c:258
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c:262
+#: wt-status.c:260
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c:264
+#: wt-status.c:262
 msgid "both added:"
 msgstr "�方添加："
 
-#: wt-status.c:266
+#: wt-status.c:264
 msgid "both modified:"
 msgstr "�方修改："
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "copied:"
 msgstr "拷�："
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c:282
+#: wt-status.c:280
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c:284
+#: wt-status.c:282
 msgid "renamed:"
 msgstr "�命�："
 
-#: wt-status.c:286
+#: wt-status.c:284
 msgid "typechange:"
 msgstr "类型�更："
 
-#: wt-status.c:288
+#: wt-status.c:286
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "unmerged:"
 msgstr "未�并："
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:372
+#: wt-status.c:370
 msgid "new commits, "
 msgstr "新�交, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:374
+#: wt-status.c:372
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:376
+#: wt-status.c:374
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:821
+#: wt-status.c:819
 #, 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:853
+#: wt-status.c:851
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:855
+#: wt-status.c:853
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:937
+#: wt-status.c:935
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
-"��改动上�的一行。\n"
-"下�的所有内容�将被删除。"
+"��改动或删除上�的一行。\n"
+"其下所有内容都将被忽略。"
 
-#: wt-status.c:1049
+#: wt-status.c:1048
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:1052
+#: wt-status.c:1051
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1054
+#: wt-status.c:1053
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止�并）"
 
-#: wt-status.c:1059
+#: wt-status.c:1058
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:1062
+#: wt-status.c:1061
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:1072
+#: wt-status.c:1071
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:1075
+#: wt-status.c:1074
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:1079
+#: wt-status.c:1078
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1081
+#: wt-status.c:1080
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1083
+#: wt-status.c:1082
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" ��原有分支）"
 
@@ -4688,7 +4792,7 @@ msgstr "�外，您的索引中包�未�交的�更。"
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的�更。"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"
@@ -4702,7 +4806,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
 msgid "unexpected diff status %c"
 msgstr "�外的差异状� %c"
 
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
 msgid "updating files failed"
 msgstr "更新文件失败"
 
@@ -4711,108 +4815,108 @@ msgstr "更新文件失败"
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:151
+#: builtin/add.c:153
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之�尚未被暂存的�更："
 
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
 msgid "Could not read the index"
 msgstr "�能读�索引"
 
-#: builtin/add.c:222
+#: builtin/add.c:224
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "无法打开 '%s' 进行写入。"
 
-#: builtin/add.c:226
+#: builtin/add.c:228
 msgid "Could not write patch"
 msgstr "�能生�补�"
 
-#: builtin/add.c:229
+#: builtin/add.c:231
 msgid "editing patch failed"
 msgstr "编辑补�失败"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/add.c:234
+#: builtin/add.c:236
 msgid "Empty patch. Aborted."
 msgstr "空补�。异常终止。"
 
-#: builtin/add.c:239
+#: builtin/add.c:241
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能应用 '%s'"
 
-#: builtin/add.c:249
+#: builtin/add.c:251
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: 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:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:272
+#: builtin/add.c:274
 msgid "interactive picking"
 msgstr "交互�拣选"
 
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
-#: builtin/add.c:274
+#: builtin/add.c:276
 msgid "edit current diff and apply"
 msgstr "编辑当�差异并应用"
 
-#: builtin/add.c:275
+#: builtin/add.c:277
 msgid "allow adding otherwise ignored files"
 msgstr "�许添加忽略的文件"
 
-#: builtin/add.c:276
+#: builtin/add.c:278
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:277
+#: builtin/add.c:279
 msgid "record only the fact that the path will be added later"
 msgstr "�记录，该路径���添加"
 
-#: builtin/add.c:278
+#: builtin/add.c:280
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改�的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:281
+#: builtin/add.c:283
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相�）"
 
-#: builtin/add.c:283
+#: builtin/add.c:285
 msgid "don't add, only refresh the index"
 msgstr "�添加，�刷新索引"
 
-#: builtin/add.c:284
+#: builtin/add.c:286
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错�能添加的文件"
 
-#: builtin/add.c:285
+#: builtin/add.c:287
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模�下文件（�使�存在）是�被忽略"
 
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的�执行�"
 
-#: builtin/add.c:288
+#: builtin/add.c:290
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入�仓库时给予警告"
 
-#: builtin/add.c:303
+#: builtin/add.c:305
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -4829,7 +4933,8 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"您在当�仓库中添加了�外一个Git仓库。克隆外层的仓库将�包�嵌入仓库的内容，并且�知�该如何获�它。\n"
+"您在当�仓库中添加了�外一个Git仓库。克隆外层的仓库将�包�嵌入仓库的内容，并"
+"且�知�该如何获�它。\n"
 "如果您�添加一个�模组，使用：\n"
 "\n"
 "\tgit submodule add <url> %s\n"
@@ -4840,149 +4945,149 @@ msgstr ""
 "\n"
 "�� \"git help submodule\" 获�更多信�。"
 
-#: builtin/add.c:331
+#: builtin/add.c:333
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入� git 仓库：%s"
 
-#: builtin/add.c:349
+#: builtin/add.c:351
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "使用 -f �数如果您确实�添加它们。\n"
 
-#: builtin/add.c:357
+#: builtin/add.c:359
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:394
+#: builtin/add.c:396
 msgid "-A and -u are mutually incompatible"
 msgstr "-A 和 -u 选项互斥"
 
-#: builtin/add.c:401
+#: builtin/add.c:403
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "选项 --ignore-missing �能和 --dry-run �时使用"
 
-#: builtin/add.c:405
+#: builtin/add.c:407
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�数 --chmod �值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:420
+#: builtin/add.c:422
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:421
+#: builtin/add.c:423
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想�执行 'git add .'？\n"
 
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: 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
 msgid "index file corrupt"
 msgstr "索引文件��"
 
-#: builtin/am.c:413
+#: builtin/am.c:414
 msgid "could not parse author script"
 msgstr "�能解�作者脚本"
 
-#: builtin/am.c:489
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩�删除"
 
-#: builtin/am.c:530
+#: builtin/am.c:539
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的输入行：'%s'。"
 
-#: builtin/am.c:567
+#: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 
-#: builtin/am.c:593
+#: builtin/am.c:602
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:777
+#: builtin/am.c:786
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解�补� '%s'"
 
-#: builtin/am.c:842
+#: builtin/am.c:851
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一个 StGIT 补�队列被应用"
 
-#: builtin/am.c:889
+#: builtin/am.c:899
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:897
+#: builtin/am.c:911
 msgid "invalid timezone offset"
 msgstr "无效的时区�移值"
 
-#: builtin/am.c:986
+#: builtin/am.c:1004
 msgid "Patch format detection failed."
 msgstr "补�格�探测失败。"
 
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:995
+#: builtin/am.c:1013
 msgid "Failed to split patches."
 msgstr "无法拆分补�。"
 
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1171
+#: builtin/am.c:1193
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1172
+#: builtin/am.c:1194
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1173
+#: builtin/am.c:1195
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若��原至原始分支并�止补��作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1304
+#: builtin/am.c:1302
 msgid "Patch is empty."
 msgstr "补�为空。"
 
-#: builtin/am.c:1370
+#: builtin/am.c:1368
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1392
+#: builtin/am.c:1390
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: builtin/am.c:1586
+#: builtin/am.c:1584
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1588
+#: builtin/am.c:1586
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1607
+#: builtin/am.c:1605
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4990,37 +5095,37 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1613
+#: builtin/am.c:1611
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1636
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入一树对象"
 
-#: builtin/am.c:1669
+#: builtin/am.c:1667
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
 msgid "failed to write commit object"
 msgstr "无法写�交对象"
 
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1735
+#: builtin/am.c:1733
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "标准输入没有和终端关�，�能进行交互��作。"
 
-#: builtin/am.c:1740
+#: builtin/am.c:1738
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
@@ -5029,35 +5134,35 @@ msgstr "�交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/�[n]/编辑[e]/查看补�[v]/应用所有[a]："
 
-#: builtin/am.c:1800
+#: builtin/am.c:1798
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1856
+#: builtin/am.c:1854
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1864
+#: builtin/am.c:1862
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1870
+#: builtin/am.c:1868
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "失败的补�文件副本�于：%s"
 
-#: builtin/am.c:1915
+#: builtin/am.c:1913
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5067,7 +5172,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1922
+#: builtin/am.c:1920
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5078,150 +5183,149 @@ msgstr ""
 "您应该对已�冲�解决的�一个文件执行 'git add' �标记已�完�。 \n"
 "你�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�能解�对象 '%s'。"
 
-#: builtin/am.c:2083
+#: builtin/am.c:2081
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2116
 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:2180
+#: builtin/am.c:2179
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2212
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2213
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2219
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2221
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2223
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "�默模�"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2226
 msgid "add a Signed-off-by line to the commit message"
 msgstr "在�交说明中添加一个 Signed-off-by 签�"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2229
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2231
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2233
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2235
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2237
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2240
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 传递 --keep-cr �数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2243
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: 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:2267
-#: builtin/am.c:2273
+#: 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
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 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:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "格�"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2269
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2275
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2277
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2280
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2283
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2286
 msgid "restore the original branch and abort the patching operation."
 msgstr "��原始分支并终止打补��作。"
 
-#: builtin/am.c:2291
+#: builtin/am.c:2290
 msgid "lie about committer date"
 msgstr "将作者日期作为�交日期"
 
-#: builtin/am.c:2293
+#: builtin/am.c:2292
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2295
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2298
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2317
+#: builtin/am.c:2316
 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."
@@ -5229,16 +5333,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2323
 msgid "failed to read the index"
 msgstr "无法读�索引"
 
-#: builtin/am.c:2339
+#: builtin/am.c:2338
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2363
+#: builtin/am.c:2362
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5247,7 +5351,7 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2369
+#: builtin/am.c:2368
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
@@ -5449,15 +5553,19 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
 
 #: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-c | -C) [<�分支>] <新分支>"
+
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:32
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:145
+#: builtin/branch.c:146
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5467,7 +5575,7 @@ msgstr ""
 "         '%s'，但未�并到 HEAD。"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:149
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5476,12 +5584,12 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已��并到 HEAD，\n"
 "         然而�尚未被�并到分支 '%s' 。"
 
-#: builtin/branch.c:163
+#: builtin/branch.c:164
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指�的�交对象"
 
-#: builtin/branch.c:167
+#: builtin/branch.c:168
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5490,91 +5598,112 @@ msgstr ""
 "分支 '%s' 没有完全�并。\n"
 "如果您确认�删除它，执行 'git branch -D %s'。"
 
-#: builtin/branch.c:180
+#: builtin/branch.c:181
 msgid "Update of config-file failed"
-msgstr "无法更新 config 文件"
+msgstr "更新�置文件失败"
 
-#: builtin/branch.c:211
+#: builtin/branch.c:212
 msgid "cannot use -a with -d"
 msgstr "�能将 -a 和 -d �时使用"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:218
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指�的�交对象"
 
-#: builtin/branch.c:231
+#: builtin/branch.c:232
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:247
+#: builtin/branch.c:248
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未�现。"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "无法删除远程跟踪分支 '%s'"
 
-#: builtin/branch.c:263
+#: builtin/branch.c:264
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "无法删除分支 '%s'"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:271
+#: builtin/branch.c:272
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "�能解�格�化字符串"
+
+#: builtin/branch.c:450
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�基到 %s"
 
-#: builtin/branch.c:449
+#: builtin/branch.c:454
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "无法拷�当�分支因为�处于任何分支上。"
+
+#: builtin/branch.c:472
 msgid "cannot rename the current branch while not on any."
 msgstr "无法�命�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:474
+#: builtin/branch.c:483
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支�：'%s'"
 
-#: builtin/branch.c:491
+#: builtin/branch.c:504
 msgid "Branch rename failed"
 msgstr "分支�命�失败"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "分支拷�失败"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "已将错误命�的分支 '%s' �制"
+
+#: builtin/branch.c:513
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
-msgstr "�命�掉一个错误命�的旧分支 '%s'"
+msgstr "已将错误命�的分支 '%s' �命�"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:519
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�命�为 %s，但 HEAD 没有更新�"
 
-#: builtin/branch.c:506
+#: builtin/branch.c:528
 msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被�命�，但更新 config 文件失败"
+msgstr "分支被�命�，但更新�置文件失败"
+
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr "分支已拷�，但更新�置文件失败"
 
-#: builtin/branch.c:522
+#: builtin/branch.c:546
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5585,230 +5714,226 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:579
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:581
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若�数出现两次则显示上游分支"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:582
 msgid "suppress informational messages"
 msgstr "�显示信�"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:583
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "设置跟踪模�（�� git-pull(1)）"
 
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "改�上游信�"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "��使用"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:563
+#: builtin/branch.c:587
 msgid "change the upstream info"
 msgstr "改�上游信�"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:588
 msgid "Unset the upstream info"
 msgstr "�消上游信�的设置"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:589
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:590
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
 msgid "print only branches that contain the commit"
 msgstr "�打�包�该�交的分支"
 
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
 msgid "print only branches that don't contain the commit"
 msgstr "�打��包�该�交的分支"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:598
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:575
+#: builtin/branch.c:599
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪�本地分支"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:601
 msgid "delete fully merged branch"
 msgstr "删除完全�并的分支"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:602
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（�使没有�并）"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:603
 msgid "move/rename a branch and its reflog"
 msgstr "移动/�命�一个分支，以�它的引用日志"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:604
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/�命�一个分支，�使目标已存在"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "拷�一个分支和它的引用日志"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "拷�一个分支，�使目标已存在"
+
+#: builtin/branch.c:607
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:608
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:610
 msgid "edit the description for the branch"
 msgstr "标记分支的�述"
 
-#: builtin/branch.c:585
+#: builtin/branch.c:611
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建�移动/�命��删除"
 
-#: builtin/branch.c:586
+#: builtin/branch.c:612
 msgid "print only branches that are merged"
 msgstr "�打�已��并的分支"
 
-#: builtin/branch.c:587
+#: builtin/branch.c:613
 msgid "print only branches that are not merged"
 msgstr "�打�尚未�并的分支"
 
-#: builtin/branch.c:588
+#: builtin/branch.c:614
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
 msgid "key"
 msgstr "key"
 
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: 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
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:593
+#: builtin/branch.c:619
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
 msgid "sorting and filtering are case insensitive"
 msgstr "排�和过滤属于大�写��感"
 
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "输出格�"
 
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "无法将 HEAD 解�为有效引用。"
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:668
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose �兼容"
 
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
 msgid "branch name required"
 msgstr "必须�供分支�"
 
-#: builtin/branch.c:681
+#: builtin/branch.c:708
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分离头指针�供�述"
 
-#: builtin/branch.c:686
+#: builtin/branch.c:713
 msgid "cannot edit description of more than one branch"
 msgstr "�能为一个以上的分支编辑�述"
 
-#: builtin/branch.c:693
+#: builtin/branch.c:720
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无�交。"
 
-#: builtin/branch.c:696
+#: builtin/branch.c:723
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "为�命��作�供了太多的分支�"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "为拷��作�供了太多的分支�"
 
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "为设置新上游�供了太多的分支�"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "为�命��作�供了太多的�数"
 
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "为设置新上游�供了太多的�数"
+
+#: builtin/branch.c:756
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指�任何分支。"
 
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:727
+#: builtin/branch.c:763
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "为�消上游设置�作�供了太多的分支�"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "为�消上游设置�作�供了太多的�数"
 
-#: builtin/branch.c:743
+#: builtin/branch.c:779
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法�消 HEAD 的上游设置因为它没有指�一个分支"
 
-#: builtin/branch.c:749
+#: builtin/branch.c:785
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信�"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:797
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "手工创建 'HEAD' 没有�义"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:803
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支��数没有�义"
 
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"如果你想用 '%s' 跟踪 '%s', 这么�：\n"
-"\n"
+"��支�选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
 
 #: builtin/bundle.c:45
 #, c-format
@@ -5823,7 +5948,7 @@ msgstr "需�一个仓库�创建包。"
 msgid "Need a repository to unbundle."
 msgstr "需�一个仓库�解包。"
 
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5831,7 +5956,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5839,63 +5964,63 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> �以是其中之一：blob�tree�commit�tag"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
 msgid "show object size"
 msgstr "显示对象大�"
 
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
 msgid "pretty-print object's content"
 msgstr "美观地打�对象的内容"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数�对象，对其内容�文本转�"
 
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数�对象，对其内容�过滤"
 
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
 msgid "blob"
 msgstr "数�对象"
 
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "�许 -s 和 -t 对��的对象生效"
 
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�和内容"
 
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�"
 
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟�树内符�链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check �数显示所有对象"
 
@@ -5923,7 +6048,7 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -6013,9 +6138,9 @@ msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
 #: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
 msgid "string"
 msgstr "字符串"
 
@@ -6086,55 +6211,55 @@ msgstr "�能�时更新路径并切�到分支'%s'。"
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6155,7 +6280,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6182,160 +6307,160 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应�有一个引用，�给出了 %d 个"
 
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�时使用"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' �能和 '%s' �时使用"
 
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: 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
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信�"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
 msgid "conflict style (merge or diff3)"
 msgstr "冲�输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "二次猜测'git checkout <无此分支>'"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: 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
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b�-B 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
 msgid "Missing branch name; try -b"
 msgstr "缺少分支�；�试 -b"
 
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' �是一个�交，�能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路径�数 '%s'"
 
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6373,7 +6498,7 @@ msgstr "将忽略仓库 %s\n"
 msgid "failed to remove %s"
 msgstr "无法删除 %s"
 
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6386,7 +6511,7 @@ msgstr ""
 "foo        - 通过唯一�缀选择一个选项\n"
 "           - （空）什么也�选择\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6407,38 +6532,38 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结�选择\n"
 
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
 #: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:660
+#: builtin/clean.c:663
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除�目>> "
 
-#: builtin/clean.c:697
+#: builtin/clean.c:700
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹�的�目"
 
-#: builtin/clean.c:718
+#: builtin/clean.c:721
 msgid "Select items to delete"
 msgstr "选择�删除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "��。\n"
 
-#: builtin/clean.c:792
+#: builtin/clean.c:795
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6456,212 +6581,212 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在�示符下选择的帮助"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "请选择"
 
-#: builtin/clean.c:828
+#: builtin/clean.c:831
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下�目："
 msgstr[1] "将删除如下�目："
 
-#: builtin/clean.c:844
+#: builtin/clean.c:847
 msgid "No more files to clean, exiting."
 msgstr "没有�清�的文件，退出。"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:909
 msgid "do not print names of files removed"
 msgstr "�打�删除文件的�称"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:911
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:912
 msgid "interactive cleaning"
 msgstr "交互�清除"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:914
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: 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/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "模�"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:916
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模�> 到忽略规则"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:917
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:919
 msgid "remove only ignored files"
 msgstr "�删除忽略的文件"
 
-#: builtin/clean.c:934
+#: builtin/clean.c:937
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X �能�时使用"
 
-#: builtin/clean.c:938
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 设置为 true 且未�供 -i�-n 或 -f 选项，拒�执行清�动作"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:944
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未�供 -i�-n 或 -f 选项，拒�执行清�动作"
 
-#: builtin/clone.c:38
+#: builtin/clone.c:39
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:82
+#: builtin/clone.c:83
 msgid "don't create a checkout"
 msgstr "�创建一个检出"
 
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:88
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜�仓库（也是纯仓库）"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:90
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:92
 msgid "don't use local hardlinks, always copy"
 msgstr "�使用本地硬链接，始终�制"
 
-#: builtin/clone.c:93
+#: builtin/clone.c:94
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
 msgid "initialize submodules in the clone"
 msgstr "在克隆时�始化�模组"
 
-#: builtin/clone.c:102
+#: builtin/clone.c:103
 msgid "number of submodules cloned in parallel"
 msgstr "并�克隆的�模组的数�"
 
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "模�目录"
 
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
 msgid "reference repository"
 msgstr "�考仓库"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:111
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时�考 --reference 指�的本地仓库"
 
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "�称"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:113
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <�称> 而�是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:115
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而�是远程 HEAD"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:117
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
 #: builtin/pull.c:205
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:119
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
 #: parse-options.h:142
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:121
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历�，除了特定版本"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:125
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�克隆一个分支�HEAD 或 --branch"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:127
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "��克隆任何标签，并且�续获��作也�下载它们"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:129
 msgid "any cloned submodules will be shallow"
 msgstr "�模组将以浅下载模�克隆"
 
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:133
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置�置信�"
 
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 地�"
 
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
 
-#: builtin/clone.c:272
+#: builtin/clone.c:273
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6669,42 +6794,42 @@ msgstr ""
 "无法猜到目录�。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:325
+#: builtin/clone.c:326
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: �能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:397
+#: builtin/clone.c:398
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/clone.c:405
+#: builtin/clone.c:406
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一个目录"
 
-#: builtin/clone.c:419
+#: builtin/clone.c:420
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "对 %s 调用 stat 失败\n"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:442
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:445
+#: builtin/clone.c:446
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷�文件至 '%s'"
 
-#: builtin/clone.c:470
+#: builtin/clone.c:471
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:482
+#: builtin/clone.c:483
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6714,135 +6839,135 @@ msgstr ""
 "您�以通过 'git status' 检查哪些已被检出，然�使用命令\n"
 "'git checkout -f HEAD' �试\n"
 
-#: builtin/clone.c:559
+#: builtin/clone.c:560
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�能�现�克隆的远程分支 %s。"
 
-#: builtin/clone.c:654
+#: builtin/clone.c:655
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必须的对象"
 
-#: builtin/clone.c:670
+#: builtin/clone.c:671
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:719
+#: builtin/clone.c:720
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指�一个�存在的引用，无法检出。\n"
 
-#: builtin/clone.c:750
+#: builtin/clone.c:751
 msgid "unable to checkout working tree"
 msgstr "�能检出工作区"
 
-#: builtin/clone.c:792
+#: builtin/clone.c:796
 msgid "unable to write parameters to config file"
 msgstr "无法将�数写入�置文件"
 
-#: builtin/clone.c:855
+#: builtin/clone.c:859
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack �清�"
 
-#: builtin/clone.c:857
+#: builtin/clone.c:861
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:898
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
-#: builtin/clone.c:907
+#: builtin/clone.c:911
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项�兼容。"
 
-#: builtin/clone.c:910
+#: builtin/clone.c:914
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项�兼容。"
 
-#: builtin/clone.c:923
+#: builtin/clone.c:927
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
 
-#: builtin/clone.c:939
+#: builtin/clone.c:943
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:949
+#: builtin/clone.c:953
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "�能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:967
+#: builtin/clone.c:971
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能创建工作区目录 '%s'"
 
-#: builtin/clone.c:979
+#: builtin/clone.c:983
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:981
+#: builtin/clone.c:985
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以� --reference-if-able �兼容"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
 msgid "source repository is shallow, ignoring --local"
 msgstr "�仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "�知�如何克隆 %s"
 
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未�现"
 
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -6976,98 +7101,98 @@ msgstr ""
 "然�执行 \"git cherry-pick --continue\" 继续对其余�交执行拣选\n"
 "�作。\n"
 
-#: builtin/commit.c:319
+#: builtin/commit.c:318
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:359
 msgid "unable to create temporary index"
 msgstr "�能创建临时索引"
 
-#: builtin/commit.c:366
+#: builtin/commit.c:365
 msgid "interactive add failed"
 msgstr "交互�添加失败"
 
-#: builtin/commit.c:379
+#: builtin/commit.c:378
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:381
+#: builtin/commit.c:380
 msgid "Failed to update main cache tree"
 msgstr "�能更新树的主缓存"
 
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:459
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a merge."
 msgstr "在�并过程中�能�部分�交。"
 
-#: builtin/commit.c:461
+#: builtin/commit.c:463
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中�能�部分�交。"
 
-#: builtin/commit.c:470
+#: builtin/commit.c:471
 msgid "cannot read the index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:583
+#: builtin/commit.c:587
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者信�"
 
-#: builtin/commit.c:585
+#: builtin/commit.c:589
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有�法的作者信�"
 
-#: builtin/commit.c:604
+#: builtin/commit.c:608
 msgid "malformed --author parameter"
 msgstr "�法的 --author �数"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:660
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当��交说明使用的注释字符"
 
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查询�交 %s"
 
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读�日志信�）\n"
 
-#: builtin/commit.c:707
+#: builtin/commit.c:711
 msgid "could not read log from standard input"
 msgstr "�能从标准输入中读�日志信�"
 
-#: builtin/commit.c:711
+#: builtin/commit.c:715
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能读�日志文件 '%s'"
 
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
 msgid "could not read SQUASH_MSG"
 msgstr "�能读� SQUASH_MSG"
 
-#: builtin/commit.c:743
+#: builtin/commit.c:747
 msgid "could not read MERGE_MSG"
 msgstr "�能读� MERGE_MSG"
 
-#: builtin/commit.c:797
+#: builtin/commit.c:801
 msgid "could not write commit template"
 msgstr "�能写�交模版"
 
-#: builtin/commit.c:815
+#: builtin/commit.c:819
 #, c-format
 msgid ""
 "\n"
@@ -7081,7 +7206,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:824
 #, c-format
 msgid ""
 "\n"
@@ -7095,7 +7220,7 @@ msgstr ""
 "\t%s\n"
 "然��试。\n"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:837
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7104,7 +7229,7 @@ msgstr ""
 "请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
 "说明将会终止�交。\n"
 
-#: builtin/commit.c:840
+#: builtin/commit.c:844
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7115,346 +7240,347 @@ msgstr ""
 "也�以删除它们。一个空的�交说明将会终止�交。\n"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:857
+#: builtin/commit.c:861
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:865
+#: builtin/commit.c:869
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:872
+#: builtin/commit.c:876
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:889
+#: builtin/commit.c:893
 msgid "Cannot read index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:951
+#: builtin/commit.c:958
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项�供�交说明。\n"
 
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 'Name <email>' 格�，且未能在现有作者中找到匹�"
 
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件�数 '%s'"
 
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项�兼容"
 
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m �能和 -c/-C/-F/--fixup �时使用。"
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author �能和 -C�-c 或 --amend �时使用。"
 
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "�能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
 msgid "No paths with --include/--only does not make sense."
 msgstr "�数 --include/--only �跟路径没有�义。"
 
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项�时使用没有�义。"
 
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
 msgid "show stash information"
 msgstr "显示贮�区信�"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
 msgid "mode"
 msgstr "模�"
 
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模��的�选�数：all�normal�no。（默认：all）"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
 msgid "show ignored files"
 msgstr "显示忽略的文件"
 
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的�交"
 
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
 msgid "could not parse newly created commit"
 msgstr "�能解�新创建的�交"
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
 msgid " (root-commit)"
 msgstr "（根�交）"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
 msgid "commit message"
 msgstr "�交说明"
 
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格�的�交说明用以修正指定的�交"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格�的�交说明用以压缩至指定的�交"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签�"
 
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
 #  译者：�选值，�能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
 msgid "default"
 msgstr "default"
 
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除�交说明里的空格和#注释"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG �交签�"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩�"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止�交；您未更改�自模版的�交说明。\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止�交；您未更改�自模版的�交说明。\n"
+
+#: builtin/commit.c:1809
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7618,12 +7744,12 @@ msgstr ""
 msgid "--local can only be used inside a git repository"
 msgstr "--local �能在一个仓库内使用"
 
-#: builtin/config.c:621
+#: builtin/config.c:624
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "�能创建�置文件 %s"
 
-#: builtin/config.c:633
+#: builtin/config.c:637
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7632,11 +7758,11 @@ msgstr ""
 "无法用一个值覆盖多个值\n"
 "       使用一个正则表达��--add 或 --replace-all �修改 %s。"
 
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
 msgid "print sizes in human readable format"
 msgstr "以用户�读的格�显示大�"
 
@@ -7660,47 +7786,47 @@ msgstr "轻�级的"
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c:253
+#: builtin/describe.c:264
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
 
-#: builtin/describe.c:257
+#: builtin/describe.c:268
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "附注标签 %s 没有嵌入�称"
 
-#: builtin/describe.c:259
+#: builtin/describe.c:270
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "标签 '%s' 的确是在 '%s'"
 
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�是一个有效的对象� %s"
 
-#: builtin/describe.c:289
+#: builtin/describe.c:300
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s �是一个有效的 '%s' 对象"
 
-#: builtin/describe.c:306
+#: builtin/describe.c:317
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹� '%s'"
 
-#: builtin/describe.c:308
+#: builtin/describe.c:319
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "�索�述 %s\n"
 
-#: builtin/describe.c:355
+#: builtin/describe.c:366
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完��索 %s\n"
 
-#: builtin/describe.c:382
+#: builtin/describe.c:393
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7709,7 +7835,7 @@ msgstr ""
 "没有附注标签能�述 '%s'。\n"
 "然而，存在未附注标签：�试 --tags。"
 
-#: builtin/describe.c:386
+#: builtin/describe.c:397
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7718,12 +7844,12 @@ msgstr ""
 "没有标签能�述 '%s'。\n"
 "�试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:427
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已�历 %lu 个�交\n"
 
-#: builtin/describe.c:419
+#: builtin/describe.c:430
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7732,75 +7858,75 @@ msgstr ""
 "�现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃�索\n"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:452
 msgid "find the tag that comes after the commit"
 msgstr "寻找该�交之�的标签"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:453
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试�索策略"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:454
 msgid "use any ref"
 msgstr "使用任�引用"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:455
 msgid "use any tag, even unannotated"
 msgstr "使用任�标签，�使未附带注释"
 
-#: builtin/describe.c:445
+#: builtin/describe.c:456
 msgid "always use long format"
 msgstr "始终使用长�交�格�"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:457
 msgid "only follow first parent"
 msgstr "�跟�第一个父�交"
 
-#: builtin/describe.c:449
+#: builtin/describe.c:460
 msgid "only output exact matches"
 msgstr "�输出精确匹�"
 
-#: builtin/describe.c:451
+#: builtin/describe.c:462
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:453
+#: builtin/describe.c:464
 msgid "only consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:455
+#: builtin/describe.c:466
 msgid "do not consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的�交�作为�备"
 
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:470
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于�工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:462
+#: builtin/describe.c:473
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于��的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:480
+#: builtin/describe.c:491
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 与 --abbrev=0 �兼容"
 
-#: builtin/describe.c:509
+#: builtin/describe.c:520
 msgid "No names found, cannot describe anything."
 msgstr "没有�现�称，无法�述任何东西。"
 
-#: builtin/describe.c:552
+#: builtin/describe.c:563
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 与�交��兼容"
 
-#: builtin/describe.c:554
+#: builtin/describe.c:565
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 与�交��兼容"
 
@@ -7814,21 +7940,21 @@ msgstr "'%s'：�是一个正规文件或符�链接"
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c:359
+#: builtin/diff.c:357
 msgid "Not a git repository"
 msgstr "�是一个 git 仓库"
 
-#: builtin/diff.c:402
+#: builtin/diff.c:400
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "�供了无效对象 '%s'。"
 
-#: builtin/diff.c:411
+#: builtin/diff.c:409
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "�供了超过两个数�对象：'%s'"
 
-#: builtin/diff.c:416
+#: builtin/diff.c:414
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处�的对象 '%s'。"
@@ -7837,27 +7963,27 @@ msgstr "无法处�的对象 '%s'。"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<�交> [<�交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读�符�链接文件 %s"
 
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读�符�链接 %2$s 指�的对象 %1$s"
 
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7865,71 +7991,71 @@ msgstr ""
 "�支�在目录比较模�（'-d' 和 '--dir-diff'）中采用组�差异格�（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下�。"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者��它们。"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "�动差异比较工具之���示"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符�链接"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "<tool>"
 msgstr "<工具>"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示�以用在 `--tool` �数�的差异工具列表"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr "当执行 diff 工具返回�零退出�时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "<command>"
 msgstr "<命令>"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> �数�供 <工具>"
 
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 
@@ -7937,232 +8063,232 @@ msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之�显示进度"
 
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
 msgid "select handling of signed tags"
 msgstr "选择如何处�签�标签"
 
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指�被过滤对象时该标签的处�方�"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
 msgid "Dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
 msgid "Import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
 msgid "Fake a tagger when tags lack one"
 msgstr "当标签缺少标记者字段时，�装�供一个"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
 msgid "Output full tree for each commit"
 msgstr "�次�交都输出整个树"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
 msgid "Use the done feature to terminate the stream"
 msgstr "使用 done 功能�终止�"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
 msgid "Skip output of blob data"
 msgstr "跳过数�对象的输出"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
 msgid "Apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
 msgid "anonymize output"
 msgstr "匿�输出"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆盖它"
 
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓�"
 
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的标签和关�对象"
 
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
 msgid "do not fetch all tags (--no-tags)"
 msgstr "�抓�任何标签(--no-tags)"
 
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
 msgid "number of submodules fetched in parallel"
 msgstr "�模组获�的并�数"
 
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已��存在的分支的跟踪分支"
 
 #  译者：�选值，�能翻译
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
 msgid "control recursive fetching of submodules"
 msgstr "控制�模组的递归抓�"
 
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "��下载包"
 
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
 msgid "allow updating of HEAD ref"
 msgstr "�许更新 HEAD 引用"
 
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历�"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间�深化浅克隆的历�"
 
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "转�为一个完整的仓库"
 
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
 msgid "dir"
 msgstr "目录"
 
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
 msgid "prepend this to submodule path output"
 msgstr "在�模组路径输出的��加上此目录"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获��模组的缺�值（比�置文件优先级低）"
 
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
 msgid "Couldn't find remote ref HEAD"
 msgstr "无法�现远程 HEAD 引用"
 
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "�置�� fetch.output 包�无效值 %s"
 
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未�现"
 
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
 msgid "[rejected]"
 msgstr "[已拒�]"
 
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
 msgid "can't fetch in current branch"
 msgstr "当�分支下�能执行获��作"
 
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
 msgid "unable to update local ref"
 msgstr "�能更新本地引用"
 
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
 msgid "non-fast-forward"
 msgstr "�快进"
 
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未��所有必须的对象\n"
 
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "拒� %s 因为浅克隆��许被更新"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
 #, c-format
 msgid "From %.*s\n"
 msgstr "�自 %.*s\n"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -8172,95 +8298,95 @@ msgstr ""
 " 'git remote prune %s' �删除旧的�有冲�的分支"
 
 #  译者：注����导空格
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将�为摇摆状�）"
 
 #  译者：注����导空格
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�为摇摆状�）"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "拒�获�到�纯仓库的当�分支 %s"
 
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr "�知�如何从 %s 获�"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获� %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "�能获� %s"
 
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
 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:1279
+#: builtin/fetch.c:1301
 msgid "You need to specify a tag name."
 msgstr "您需�指定一个标签�称。"
 
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen �支�负数深度"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow �能�时使用"
 
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，�数 --unshallow 没有�义"
 
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能带一个仓库�数"
 
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何�义"
 
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "获�组并指定引用规格没有�义"
 
@@ -8269,23 +8395,23 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "��交说明中最多�制指定�目（�并而�的�交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
 msgid "alias for --log (deprecated)"
 msgstr "�数 --log 的别�（已弃用）"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为�交说明的开始"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
 msgid "file to read from"
 msgstr "从文件中读�"
 
@@ -8325,101 +8451,105 @@ msgstr "引用��符适用于 Tcl"
 msgid "show only <n> matched refs"
 msgstr "�显示 <n> 个匹�的引用"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "�照格�中的颜色输出"
+
+#: builtin/for-each-ref.c:43
 msgid "print only refs which points at the given object"
 msgstr "�打�指�给定对象的引用"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are merged"
 msgstr "�打�已��并的引用"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are not merged"
 msgstr "�打�没有�并的引用"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which contain the commit"
 msgstr "�打�包�该�交的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs which don't contain the commit"
 msgstr "�打��包�该�交的引用"
 
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
 msgid "Checking object directories"
 msgstr "检查对象目录中"
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
 msgid "show dangling objects"
 msgstr "显示摇摆的对象"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
 msgid "write dangling objects in .git/lost-found"
 msgstr "将摇摆对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
 msgid "show verbose names for reachable objects"
 msgstr "显示�达对象的详细�称"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
 msgid "Checking objects"
 msgstr "检查对象中"
 
-#: builtin/gc.c:26
+#: builtin/gc.c:27
 msgid "git gc [<options>]"
 msgstr "git gc [<选项>]"
 
-#: builtin/gc.c:79
+#: builtin/gc.c:80
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "对 %s 调用 fstat 失败：%s"
 
-#: builtin/gc.c:311
+#: builtin/gc.c:312
 #, c-format
 msgid "Can't stat %s"
 msgstr "�能对 %s 调用 stat"
 
-#: builtin/gc.c:320
+#: builtin/gc.c:321
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8433,50 +8563,50 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:359
+#: builtin/gc.c:360
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加�行时间）"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "enable auto-gc mode"
 msgstr "�用自动垃圾回收模�"
 
-#: builtin/gc.c:363
+#: builtin/gc.c:364
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc �使�外一个 gc 正在执行"
 
-#: builtin/gc.c:380
+#: builtin/gc.c:381
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "无法解� gc.logexpiry 的值 %s"
 
-#: builtin/gc.c:408
+#: builtin/gc.c:409
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在��执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:411
+#: builtin/gc.c:412
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护�� \"git help gc\"。\n"
 
-#: builtin/gc.c:436
+#: builtin/gc.c:437
 #, 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:480
+#: builtin/gc.c:481
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
@@ -8485,12 +8615,12 @@ msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模�> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:235
+#: builtin/grep.c:226
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:293
+#: builtin/grep.c:284
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -8499,250 +8629,242 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支�，忽略 %s"
 
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读�树（%s）"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:628
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓��自于 %s 类型的对象"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:694
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:999
+#: builtin/grep.c:781
 msgid "search in index instead of in the work tree"
 msgstr "在索引区�索而�是在工作区"
 
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的内容中查找"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中�索"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的文件"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
 msgid "recursively search in each submodule"
 msgstr "在�一个�模组中递归�索"
 
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "基本�"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "在输出中以父项目的基本�为�缀"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
 msgid "show non-matching lines"
 msgstr "显示未匹�的行"
 
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
 msgid "case insensitive matching"
 msgstr "�区分大�写匹�"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
 msgid "match patterns only at word boundaries"
 msgstr "�在��边界匹�模�"
 
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
 msgid "process binary files as text"
 msgstr "把二进制文件当�文本处�"
 
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
 msgid "don't match patterns in binary files"
 msgstr "�在二进制文件中匹�模�"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处�二进制文件"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下寻找"
 
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达�"
 
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达�（默认）"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�为固定的字符串"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达�"
 
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
 msgid "show line numbers"
 msgstr "显示行�"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
 msgid "don't show filenames"
 msgstr "�显示文件�"
 
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
 msgid "show filenames"
 msgstr "显示文件�"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
 msgid "show only filenames instead of matching lines"
 msgstr "�显示文件�而�显示匹�的行"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �义"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
 msgid "show only the names of files without match"
 msgstr "�显示未匹�的文件�"
 
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
 msgid "print NUL after filenames"
 msgstr "在文件��输出 NUL 字符"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹�行数，而�显示匹�的行"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
 msgid "highlight matches"
 msgstr "高亮显示匹�项"
 
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
 msgid "print empty line between matches from different files"
 msgstr "在��文件的匹�项之间打�空行"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
 msgid "show filename only once above matches from same file"
 msgstr "�在�一文件的匹�项的上�显示一次文件�"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹�项��的 <n> 行上下文"
 
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
 msgid "show <n> context lines before matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
 msgid "show <n> context lines after matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
 msgid "shortcut for -C NUM"
 msgstr "快�键 -C 数字"
 
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
 msgid "show a line with the function name before matches"
 msgstr "在匹�的��显示一行函数�"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
 msgid "show the surrounding function"
 msgstr "显示所在函数的��内容"
 
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
 msgid "read patterns from file"
 msgstr "从文件读�模�"
 
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
 msgid "match <pattern>"
 msgstr "匹� <模�>"
 
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
 msgid "combine patterns specified with -e"
 msgstr "组�用 -e �数设定的模�"
 
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
 msgid "indicate hit with exit status without output"
 msgstr "�输出，而用退出�标识命中状�"
 
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
 msgid "show only matches from files that match all patterns"
 msgstr "�显示匹�所有模�的文件中的匹�"
 
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
 msgid "show parse tree for grep expression"
 msgstr "显示 grep 表达�的解�树"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
 msgid "show matching files in the pager"
 msgstr "分页显示匹�的文件"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
 msgid "no pattern given."
 msgstr "未�供模�匹�。"
 
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked �能和版本�时使用"
 
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "�能解�版本：%s"
 
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支�，忽略 --threads"
 
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
 msgid "option not supported with --recurse-submodules."
 msgstr "选项�支�和 --recurse-submodules 共用。"
 
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached 或 --untracked �能与 --no-index �时使用。"
 
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard �能用于已跟踪内容。"
 
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
 msgid "both --cached and trees are given."
 msgstr "�时给出了 --cached 和树对象。"
 
@@ -8833,12 +8955,12 @@ msgstr "无法解� emacsclient 版本。"
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "无法执行 '%s'"
 
-#: builtin/help.c:208
+#: builtin/help.c:211
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8847,7 +8969,7 @@ msgstr ""
 "'%s'：�支�的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:220
+#: builtin/help.c:223
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8856,351 +8978,351 @@ msgstr ""
 "'%s': 支�的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:337
+#: builtin/help.c:340
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:354
+#: builtin/help.c:357
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处�此请求"
 
-#: builtin/help.c:362
+#: builtin/help.c:365
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处�此请求"
 
-#: builtin/help.c:404
+#: builtin/help.c:407
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: builtin/help.c:405
+#: builtin/help.c:408
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "�一天 Git 常用的约 20 �命令"
 
-#: builtin/help.c:406
+#: builtin/help.c:409
 msgid "A Git glossary"
 msgstr "Git �汇表"
 
-#: builtin/help.c:407
+#: builtin/help.c:410
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: builtin/help.c:408
+#: builtin/help.c:411
 msgid "Defining submodule properties"
 msgstr "定义�模组属性"
 
-#: builtin/help.c:409
+#: builtin/help.c:412
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: builtin/help.c:410
+#: builtin/help.c:413
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
 
-#: builtin/help.c:411
+#: builtin/help.c:414
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推�的工作�概览"
 
-#: builtin/help.c:423
+#: builtin/help.c:426
 msgid "The common Git guides are:\n"
 msgstr "最常用的 Git �导有：\n"
 
-#: builtin/help.c:441
+#: builtin/help.c:444
 #, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 是 `%s' 的别�"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 是 '%s' 的别�"
 
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
 #, c-format
 msgid "unable to open %s"
 msgstr "�能打开 %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型�匹�"
 
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获�预期的对象 %s"
 
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，�是 %s"
 
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "early EOF"
 msgstr "过早的文件结�符（EOF）"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
 msgid "used more bytes than were available"
 msgstr "用掉了超过�用的字节"
 
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当� off_t 的定义"
 
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大�许值"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
 #, c-format
 msgid "unable to create '%s'"
 msgstr "�能创建 '%s'"
 
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "无法打开包文件 '%s'"
 
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
 msgid "pack signature mismatch"
 msgstr "包签��匹�"
 
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "�支�包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象�于�移� %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
 msgid "offset value overflow for delta base object"
 msgstr "�移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
 msgid "delta base offset is out of bound"
 msgstr "delta 基准�移越界"
 
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
 msgid "cannot pread pack file"
 msgstr "无法读�包文件"
 
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
 #, 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:603
+#: builtin/index-pack.c:604
 msgid "serious inflate inconsistency"
 msgstr "解压缩严�的�一致"
 
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "�现 %s 出现 SHA1 冲��"
 
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
 #, c-format
 msgid "unable to read %s"
 msgstr "�能读 %s"
 
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�能读�现存对象信� %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�能读�现存对象 %s"
 
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数�对象 %s"
 
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
 msgid "Error in object"
 msgstr "对象中出错"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有�对象并�都�达"
 
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
 msgid "failed to apply delta"
 msgstr "无法应用 delta"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲�（SHA1 �匹�）"
 
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
 msgid "cannot fstat packfile"
 msgstr "�能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数�"
 
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中�到���喻的问题"
 
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
 msgid "Resolving deltas"
 msgstr "处� delta 中"
 
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "�能创建线程：%s"
 
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
 msgid "confusion beyond insanity"
 msgstr "���喻"
 
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完� %d 个本地对象"
 msgstr[1] "完� %d 个本地对象"
 
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现�外（�盘��？）"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 msgstr[1] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "�能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已��"
 
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "无法写�留文件 '%s'"
 
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "无法关闭�留文件 '%s'"
 
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "�的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
 #, 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:1609
+#: builtin/index-pack.c:1610
 #, 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:1622
+#: builtin/index-pack.c:1623
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "包文件� '%s' 没有以 '.pack' 结尾"
 
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin �能和 --stdin �时使用"
 
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需�一个 git 仓库"
 
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
 
@@ -9330,132 +9452,164 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
 ">])...] [<文件>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
 msgid "edit files in place"
 msgstr "在原�编辑文件"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
 msgid "trim empty trailers"
-msgstr "删除空签�"
+msgstr "删除空的尾部署�"
 
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "在哪里放置新的尾部署�"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "当尾部署�已�存在时所采�的动作"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "当尾部署�缺失时所采�的动作"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "�输出尾部署�"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "��应用�置规则"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "连接空白折行的值"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "设置解�选项"
+
+#: builtin/interpret-trailers.c:107
 msgid "trailer"
-msgstr "签�"
+msgstr "尾部署�"
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
 msgid "trailer(s) to add"
-msgstr "�添加的签�"
+msgstr "�添加的尾部署�"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 和 --only-input �时使用没有�义"
+
+#: builtin/interpret-trailers.c:127
 msgid "no input file given for in-place editing"
 msgstr "没有给出�原�编辑的文件"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:46
+#: builtin/log.c:47
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:90
+#: builtin/log.c:91
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:147
+#: builtin/log.c:148
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: builtin/log.c:148
+#: builtin/log.c:149
 msgid "show source"
 msgstr "显示�"
 
-#: builtin/log.c:149
+#: builtin/log.c:150
 msgid "Use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:150
+#: builtin/log.c:151
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:153
+#: builtin/log.c:154
 msgid "Process line range n,m in file, counting from 1"
 msgstr "处�文件中第 n 到 m 之间的行，从 1 开始"
 
-#: builtin/log.c:249
+#: builtin/log.c:250
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:497
+#: builtin/log.c:501
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
 #, c-format
 msgid "Could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:630
+#: builtin/log.c:634
 #, c-format
 msgid "Unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:751
+#: builtin/log.c:755
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:852
+#: builtin/log.c:856
 msgid "name of output directory is too long"
 msgstr "输出目录�太长"
 
-#: builtin/log.c:868
+#: builtin/log.c:872
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:885
+#: builtin/log.c:889
 msgid "Need exactly one range."
 msgstr "�需�一个范围。"
 
-#: builtin/log.c:895
+#: builtin/log.c:899
 msgid "Not a range."
 msgstr "�是一个范围。"
 
-#: builtin/log.c:1001
+#: builtin/log.c:1005
 msgid "Cover letter needs email format"
 msgstr "信�需�邮件地�格�"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1085
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1108
+#: builtin/log.c:1112
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1158
+#: builtin/log.c:1162
 msgid "Two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
 #, c-format
 msgid "Unknown commit %s"
 msgstr "未知�交 %s"
 
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
 
-#: builtin/log.c:1280
+#: builtin/log.c:1284
 msgid "Could not find exact merge base."
 msgstr "�能找到准确的�并基线。"
 
-#: builtin/log.c:1284
+#: builtin/log.c:1288
 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"
@@ -9465,320 +9619,328 @@ msgstr ""
 "git branch --set-upstream-to �跟踪一个远程分支。或者你�以通过\n"
 "�数 --base=<base-commit-id> 手动指定一个基线�交。"
 
-#: builtin/log.c:1304
+#: builtin/log.c:1308
 msgid "Failed to find exact merge base"
 msgstr "无法找到准确的�并基线"
 
-#: builtin/log.c:1315
+#: builtin/log.c:1319
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线�交应该是版本列表的祖先"
 
-#: builtin/log.c:1319
+#: builtin/log.c:1323
 msgid "base commit shouldn't be in revision list"
 msgstr "基线�交�应该出现在版本列表中"
 
-#: builtin/log.c:1368
+#: builtin/log.c:1372
 msgid "cannot get patch id"
 msgstr "无法得到补� id"
 
-#: builtin/log.c:1425
+#: builtin/log.c:1431
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1434
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1438
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1440
 msgid "generate a cover letter"
 msgstr "生�一�附信"
 
-#: builtin/log.c:1436
+#: builtin/log.c:1442
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1443
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1438
+#: builtin/log.c:1444
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1446
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1442
+#: builtin/log.c:1448
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1444
+#: builtin/log.c:1450
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1447
+#: builtin/log.c:1453
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1456
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1453
+#: builtin/log.c:1459
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1462
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1458
+#: builtin/log.c:1464
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1460
+#: builtin/log.c:1466
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1468
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1470
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1471
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1466
+#: builtin/log.c:1472
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1473
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1469
+#: builtin/log.c:1475
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1471
+#: builtin/log.c:1477
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1472
+#: builtin/log.c:1478
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1480
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1475
+#: builtin/log.c:1481
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1483
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1480
+#: builtin/log.c:1486
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1484
+#: builtin/log.c:1490
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1486
+#: builtin/log.c:1492
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1487
+#: builtin/log.c:1493
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1488
+#: builtin/log.c:1494
 msgid "base-commit"
 msgstr "基线�交"
 
-#: builtin/log.c:1489
+#: builtin/log.c:1495
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补�列表添加�置树信�"
 
-#: builtin/log.c:1491
+#: builtin/log.c:1497
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1492
+#: builtin/log.c:1498
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "在生�补�时显示进度"
+
+#: builtin/log.c:1575
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1590
 msgid "-n and -k are mutually exclusive."
 msgstr "-n 和 -k 互斥。"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1592
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
 
-#: builtin/log.c:1592
+#: builtin/log.c:1600
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1594
+#: builtin/log.c:1602
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1596
+#: builtin/log.c:1604
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1634
 msgid "standard output, or directory, which one?"
 msgstr "标准输出或目录，哪一个？"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1636
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/log.c:1722
+#: builtin/log.c:1729
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "生�补�"
+
+#: builtin/log.c:1805
 msgid "Failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:1843
+#: builtin/log.c:1855
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:1897
+#: builtin/log.c:1909
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "�能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状�"
 
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�写字�表示 '�设未改�的' 文件"
 
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象�称"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需�删除的文件"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
 msgid "show 'other' directories' names only"
 msgstr "�显示“其他�目录的�称"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
 msgid "show line endings of files"
 msgstr "显示文件�行符格�"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
 msgid "don't show empty directories"
 msgstr "�显示空目录"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
 msgid "show unmerged files in the output"
 msgstr "显示未�并的文件"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信�"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
 msgid "skip files matching pattern"
 msgstr "匹�排除文件的模�"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
 msgid "exclude patterns are read from <file>"
 msgstr "从 <文件> 中读�排除模�"
 
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读��外的�个目录的排除模�"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
 msgid "recurse through submodules"
 msgstr "在�模组中递归"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都�在索引区，视为错误"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
 msgid "tree-ish"
 msgstr "树或�交"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "�装自从 <树或�交> 之�删除的路径�然存在"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
 msgid "show debugging data"
 msgstr "显示调试数�"
 
@@ -9869,177 +10031,181 @@ msgstr "列出整个树；�仅仅当�目录（�� --full-name）"
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<�交>...]"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:49
+#: builtin/merge.c:50
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:104
+#: builtin/merge.c:107
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:144
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:142
+#: builtin/merge.c:145
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:147
+#: builtin/merge.c:150
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�并的最��显示差异统计"
 
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:211
+#: builtin/merge.c:214
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "ç­–ç•¥"
 
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:223
+#: builtin/merge.c:226
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
-#: builtin/merge.c:227
+#: builtin/merge.c:230
 msgid "abort the current in-progress merge"
 msgstr "放弃当�正在进行的�并"
 
-#: builtin/merge.c:229
+#: builtin/merge.c:232
 msgid "continue the current in-progress merge"
 msgstr "继续当�正在进行的�并"
 
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "�许�并�相关的历�"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "校验 commit-msg 钩�"
+
+#: builtin/merge.c:265
 msgid "could not run stash."
 msgstr "�能�行贮�。"
 
-#: builtin/merge.c:264
+#: builtin/merge.c:270
 msgid "stash failed"
 msgstr "贮�失败"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:275
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
 msgid "read-tree failed"
 msgstr "读�树失败"
 
 #  译者：注����导空格
-#: builtin/merge.c:335
+#: builtin/merge.c:344
 msgid " (nothing to squash)"
 msgstr " （无�压缩）"
 
-#: builtin/merge.c:346
+#: builtin/merge.c:355
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "压缩�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:396
+#: builtin/merge.c:405
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无�并信� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:456
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指�一个�交"
 
-#: builtin/merge.c:537
+#: builtin/merge.c:546
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:657
+#: builtin/merge.c:666
 msgid "Not handling anything other than two heads merge."
 msgstr "未处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:671
+#: builtin/merge.c:680
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:686
+#: builtin/merge.c:695
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:738
+#: builtin/merge.c:747
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:747
+#: builtin/merge.c:756
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�并，使用 'git commit' 完�此次�并。\n"
 
-#: builtin/merge.c:753
+#: builtin/merge.c:762
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10053,68 +10219,68 @@ msgstr ""
 "\n"
 "以 '%c' 开头的行将被忽略，而且空�交说明将会终止�交。\n"
 
-#: builtin/merge.c:777
+#: builtin/merge.c:798
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:797
+#: builtin/merge.c:818
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:850
+#: builtin/merge.c:871
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:889
+#: builtin/merge.c:910
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:891
+#: builtin/merge.c:912
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:893
+#: builtin/merge.c:914
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:898
+#: builtin/merge.c:919
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:945
+#: builtin/merge.c:972
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在�的�值 '%1$s'"
 
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�并：%s"
 
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
 msgid "not something we can merge"
 msgstr "�能�并"
 
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
 msgid "--abort expects no arguments"
 msgstr "--abort �带�数"
 
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
 msgid "--continue expects no arguments"
 msgstr "--continue �带�数"
 
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10122,7 +10288,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10130,112 +10296,112 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您�能将 --squash 与 --no-ff �时使用。"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
 
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 没有一个 GPG 签�。"
 
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
 msgid "refusing to merge unrelated histories"
 msgstr "拒��并无关的历�"
 
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
 msgstr "已�是最新的。"
 
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
 msgstr "已�是最新的。耶�"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "使用 %s 以准备手工解决。\n"
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
@@ -10376,7 +10542,7 @@ msgstr "git mv [<选项>] <�>... <目标>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "目录 %s 在索引中并且�是�模组？"
 
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮���继续"
 
@@ -10393,68 +10559,68 @@ msgstr "强制移动/�命令，�使目标存在"
 msgid "skip move/rename errors"
 msgstr "跳过移动/�命�错误"
 
-#: builtin/mv.c:168
+#: builtin/mv.c:167
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' �是一个目录"
 
-#: builtin/mv.c:179
+#: builtin/mv.c:178
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的�命�\n"
 
-#: builtin/mv.c:183
+#: builtin/mv.c:182
 msgid "bad source"
 msgstr "�的�"
 
-#: builtin/mv.c:186
+#: builtin/mv.c:185
 msgid "can not move directory into itself"
 msgstr "�能将目录移动到自身"
 
-#: builtin/mv.c:189
+#: builtin/mv.c:188
 msgid "cannot move directory over file"
 msgstr "�能将目录移动到文件"
 
-#: builtin/mv.c:198
+#: builtin/mv.c:197
 msgid "source directory is empty"
 msgstr "�目录为空"
 
-#: builtin/mv.c:223
+#: builtin/mv.c:222
 msgid "not under version control"
 msgstr "�在版本控制之下"
 
-#: builtin/mv.c:226
+#: builtin/mv.c:225
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:234
+#: builtin/mv.c:233
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:237
+#: builtin/mv.c:236
 msgid "Cannot overwrite"
 msgstr "�能覆盖"
 
-#: builtin/mv.c:240
+#: builtin/mv.c:239
 msgid "multiple sources for the same target"
 msgstr "�一目标具有多个�"
 
-#: builtin/mv.c:242
+#: builtin/mv.c:241
 msgid "destination directory does not exist"
 msgstr "目标目录�存在"
 
-#: builtin/mv.c:249
+#: builtin/mv.c:248
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，�=%s，目标=%s"
 
-#: builtin/mv.c:270
+#: builtin/mv.c:269
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�命� '%s' 失败"
@@ -10643,19 +10809,19 @@ msgstr "�能写注解对象"
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
 #, c-format
 msgid "cannot read '%s'"
 msgstr "�能读� '%s'"
 
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
 
 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: 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' 为一个有效引用。"
@@ -10683,88 +10849,88 @@ msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒�� %2$s（在 refs/notes/ 之外）%1$s注解"
 
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: 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 "�数太多"
 
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
 #, c-format
 msgid "no note found for object %s."
 msgstr "未�现对象 %s 的注解。"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
 msgid "note contents as a string"
 msgstr "注解内容作为一个字符串"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
 msgid "note contents in a file"
 msgstr "注解内容到一个文件中"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
 msgid "reuse and edit specified note object"
 msgstr "�用和编辑指定的注解对象"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
 msgid "reuse specified note object"
 msgstr "�用指定的注解对象"
 
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
 msgid "allow storing empty note"
 msgstr "�许�存空白注释"
 
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
 msgid "replace existing notes"
 msgstr "替�已存在的注解"
 
-#: builtin/notes.c:440
+#: builtin/notes.c:441
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能添加注解。�现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
 
-#: builtin/notes.c:487
+#: builtin/notes.c:488
 msgid "read objects from stdin"
 msgstr "从标准输入读�对象"
 
-#: builtin/notes.c:489
+#: builtin/notes.c:490
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "�新加载 <命令> 的�置（�� --stdin）"
 
-#: builtin/notes.c:507
+#: builtin/notes.c:508
 msgid "too few parameters"
 msgstr "�数太少"
 
-#: builtin/notes.c:528
+#: builtin/notes.c:529
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能拷�注解。�现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:540
+#: builtin/notes.c:541
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "�对象 %s 缺少注解。�能拷�。"
 
-#: builtin/notes.c:592
+#: builtin/notes.c:593
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10773,97 +10939,97 @@ msgstr ""
 "�命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请�用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:687
+#: builtin/notes.c:688
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:689
+#: builtin/notes.c:690
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "无法删除引用 NOTES_MERGE_REF"
 
-#: builtin/notes.c:691
+#: builtin/notes.c:692
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "无法删除 'git notes merge' 工作区"
 
-#: builtin/notes.c:711
+#: builtin/notes.c:712
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "无法读�引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:713
+#: builtin/notes.c:714
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到�交。"
 
-#: builtin/notes.c:715
+#: builtin/notes.c:716
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中解��交。"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:729
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "无法解� NOTES_MERGE_REF"
 
-#: builtin/notes.c:731
+#: builtin/notes.c:732
 msgid "failed to finalize notes merge"
 msgstr "无法完�注解�并"
 
-#: builtin/notes.c:757
+#: builtin/notes.c:758
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的注解�并策略 %s"
 
-#: builtin/notes.c:773
+#: builtin/notes.c:774
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c:775
+#: builtin/notes.c:776
 msgid "Merge options"
 msgstr "�并选项"
 
-#: builtin/notes.c:777
+#: builtin/notes.c:778
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解决注解冲� (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:779
+#: builtin/notes.c:780
 msgid "Committing unmerged notes"
 msgstr "�交未�并的注解"
 
-#: builtin/notes.c:781
+#: builtin/notes.c:782
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过�交未�并的注解�完�注解�并"
 
-#: builtin/notes.c:783
+#: builtin/notes.c:784
 msgid "Aborting notes merge resolution"
 msgstr "中止注解�并的方案"
 
-#: builtin/notes.c:785
+#: builtin/notes.c:786
 msgid "abort notes merge"
 msgstr "中止注解�并"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:797
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "�能混用 --commit�--abort 或 -s/--strategy"
 
-#: builtin/notes.c:801
+#: builtin/notes.c:802
 msgid "must specify a notes ref to merge"
 msgstr "必须指定一个注解引用��并"
 
-#: builtin/notes.c:825
+#: builtin/notes.c:826
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:863
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "�于 %2$s 的一个到 %1$s 中的注解�并正在执行中"
 
-#: builtin/notes.c:865
+#: builtin/notes.c:866
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当�的注解引用（%s）"
 
-#: builtin/notes.c:867
+#: builtin/notes.c:868
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10873,218 +11039,218 @@ msgstr ""
 "自动�并说明失败。修改 %s 中的冲�并且使用命令 'git notes merge --commit' �"
 "交结果，或者使用命令 'git notes merge --abort' 终止�并。\n"
 
-#: builtin/notes.c:889
+#: builtin/notes.c:890
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:902
 msgid "attempt to remove non-existent note is not an error"
 msgstr "�试删除�存在的注解�是一个错误"
 
-#: builtin/notes.c:904
+#: builtin/notes.c:905
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
-#: builtin/notes.c:943
+#: builtin/notes.c:944
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c:985
+#: builtin/notes.c:986
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:986
+#: builtin/notes.c:987
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�命令：%s"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "�用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 写入，因为一些对象将�会被打包"
 
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
 #, c-format
 msgid "bad index version '%s'"
 msgstr "�的索引版本 '%s'"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
 msgid "do not show progress meter"
 msgstr "�显示进度表"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
 msgid "version[,offset]"
 msgstr "版本[,�移]"
 
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本�写包索引文件"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
 msgid "maximum size of each output pack file"
 msgstr "�个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
 msgid "limit pack window by objects"
 msgstr "�制打包窗�的对象数"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数��制外设置打包窗�的内存�制"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
 msgid "reuse existing objects"
 msgstr "�用已存在的对象"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹�"
 
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
 msgid "do not create an empty pack output"
 msgstr "�创建空的包输出"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读�版本��数"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
 msgid "include objects reachable from any reference"
 msgstr "包括�以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
 msgid "keep unreachable objects"
 msgstr "维���达的对象"
 
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
 msgid "pack loose unreachable objects"
 msgstr "打包�散的��达对象"
 
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适�浅克隆仓库获�的包"
 
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 文件的包"
 
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
 msgid "do not hide commits by grafts"
 msgstr "显示被�接��的�交"
 
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的�）以�高对象计数时的速度"
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
 msgid "Counting objects"
 msgstr "对象计数中"
 
@@ -11100,11 +11266,11 @@ msgstr "打包一切"
 msgid "prune loose refs (default)"
 msgstr "清除�散的引用（默认）"
 
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
 msgid "Removing duplicate objects"
 msgstr "正在删除��对象"
 
@@ -11145,7 +11311,7 @@ msgstr "和�并相关的选项"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用�基�作�代�并�作以�入修改"
 
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "�许快进�"
 
@@ -11166,24 +11332,24 @@ msgstr "并�拉�的�模组的数�"
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff 的�值无效：%s"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:403
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获�到的引用中没有�基�作的候选。"
 
-#: builtin/pull.c:401
+#: builtin/pull.c:405
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获�到的引用中没有�并�作的候选。"
 
-#: builtin/pull.c:402
+#: builtin/pull.c:406
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这�味�您�供了一个通�符引用规格但未能和远端匹�。"
 
-#: builtin/pull.c:405
+#: builtin/pull.c:409
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11193,42 +11359,42 @@ msgstr ""
 "您�求从远程 '%s' 拉�，但是未指定一个分支。因为这�是当�\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支�。"
 
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "您当��在一个分支上。"
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您��基到哪一个分支。"
 
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您��并哪一个分支。"
 
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
 msgid "See git-pull(1) for details."
 msgstr "详� git-pull(1)。"
 
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "当�分支没有跟踪信�。"
 
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: 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 "如果您想�为此分支创建跟踪信�，您�以执行："
 
-#: builtin/pull.c:439
+#: builtin/pull.c:443
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11237,27 +11403,27 @@ msgstr ""
 "您的�置中指定��并远程的引用 '%s'，\n"
 "但是没有获�到这个引用。"
 
-#: builtin/pull.c:792
+#: builtin/pull.c:796
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为�基�作忽略 --verify-signatures"
 
-#: builtin/pull.c:840
+#: builtin/pull.c:844
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 选项�在使用 --rebase 时有效。"
 
-#: builtin/pull.c:848
+#: builtin/pull.c:852
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:851
+#: builtin/pull.c:855
 msgid "pull with rebase"
 msgstr "�基�拉�"
 
-#: builtin/pull.c:852
+#: builtin/pull.c:856
 msgid "please commit or stash them."
 msgstr "请�交或贮�它们。"
 
-#: builtin/pull.c:877
+#: builtin/pull.c:881
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11267,7 +11433,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:882
+#: builtin/pull.c:886
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11284,15 +11450,15 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:897
+#: builtin/pull.c:901
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:901
+#: builtin/pull.c:905
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
-#: builtin/pull.c:908
+#: builtin/pull.c:912
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地�模组中有修改，无法�基"
 
@@ -11658,19 +11824,47 @@ msgstr "调试 unpack-trees"
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<选项>]"
 
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "��空�交"
+
+#: builtin/rebase--helper.c:23
 msgid "continue rebase"
 msgstr "继续�基"
 
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
 msgid "abort rebase"
 msgstr "中止�基"
 
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "制作�基脚本"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "缩短待办列表中的哈希值"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "扩展待办列表中的哈希值"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "检查待办列表"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "跳过�必�的拣选"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "�新排列 fixup/squash 行"
+
+#: builtin/receive-pack.c:29
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
 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"
@@ -11696,7 +11890,7 @@ msgstr ""
 "若��蔽此信�且��默认行为，设置 'receive.denyCurrentBranch'\n"
 "�置��为 'refuse'。"
 
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
 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"
@@ -11715,11 +11909,11 @@ msgstr ""
 "\n"
 "若��蔽此信�，您�以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
 msgid "You must specify a directory."
 msgstr "您必须指定一个目录。"
 
@@ -11868,12 +12062,12 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有�义"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定�跟踪的分支�在与获�镜��时使用�有�义"
 
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已�存在。"
 
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' �是一个有效的远程�称"
@@ -11896,17 +12090,17 @@ msgstr "（匹�）"
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
 #, c-format
 msgid "No such remote: %s"
 msgstr "没有这样的远程：%s"
 
-#: builtin/remote.c:640
+#: builtin/remote.c:641
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�能�命��置�节 '%s' 到 '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:661
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11917,17 +12111,17 @@ msgstr ""
 "\t%s\n"
 "\t如果必�请手动更新�置。"
 
-#: builtin/remote.c:696
+#: builtin/remote.c:697
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:731
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:795
+#: builtin/remote.c:796
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11937,113 +12131,113 @@ msgid_plural ""
 msgstr[0] "注�：ref/remotes 层级之外的一个分支未被移除。�删除它，使用："
 msgstr[1] "注�：ref/remotes 层级之外的一些分支未被移除。�删除它们，使用："
 
-#: builtin/remote.c:809
+#: builtin/remote.c:810
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�能移除�置�节 '%s'"
 
-#: builtin/remote.c:910
+#: builtin/remote.c:911
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获�将存储于 remotes/%s）"
 
-#: builtin/remote.c:913
+#: builtin/remote.c:914
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:915
+#: builtin/remote.c:916
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' �移除）"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:918
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:958
+#: builtin/remote.c:959
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，�能�基到一个以上的分支"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互��基到远程 %s"
 
-#: builtin/remote.c:967
+#: builtin/remote.c:968
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "�基到远程 %s"
 
-#: builtin/remote.c:970
+#: builtin/remote.c:971
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s �并"
 
-#: builtin/remote.c:973
+#: builtin/remote.c:974
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s �并"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:977
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以�和远程 %s\n"
 
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
 msgid "fast-forwardable"
 msgstr "�快进"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推�至 %-*s (%s)"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推�至 %-*s (%s)"
 
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推�至 %s"
 
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推�至 %s"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
 msgid "do not query remotes"
 msgstr "�查询远程"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获�地�：%s"
 
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
 msgid "(no URL)"
 msgstr "(æ—  URL)"
 
@@ -12051,32 +12245,32 @@ msgstr "(æ—  URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推�地�：%s"
 
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，�能是下列中的一个）：\n"
 
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -12084,155 +12278,155 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
 msgid " (status not queried)"
 msgstr "（状�未查询）"
 
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' �置的本地分支："
 msgstr[1] "  为 'git pull' �置的本地分支："
 
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜�"
 
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' �置的本地引用%s："
 msgstr[1] "  为 'git push' �置的本地引用%s："
 
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根�远程设置 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�是一个有效引用：%s"
 
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
 #, c-format
 msgid "Could not setup %s"
 msgstr "�能设置 %s"
 
 #  译者：注����导空格
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将�为摇摆状��"
 
 #  译者：注����导空格
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已�为摇摆状��"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
 msgid "prune remotes after fetching"
 msgstr "抓��清除远程"
 
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推� URL 地�，而�获� URL 地�"
 
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
 msgid "return all URLs"
 msgstr "返回所有 URL 地�"
 
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
 msgid "manipulate push URLs"
 msgstr "�作推� URLS"
 
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无�义"
 
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹�模版：%s"
 
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
 msgid "Will not delete all non-push URLs"
 msgstr "将�会删除所有�推� URL 地�"
 
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于�命令之�"
 
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知�命令：%s"
@@ -12329,7 +12523,7 @@ msgstr "�能删除��仓库中的打包文件"
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable 和 -A �兼容"
 
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "无法删除 '%s'"
@@ -12459,122 +12653,122 @@ msgstr "�并"
 msgid "keep"
 msgstr "��"
 
-#: builtin/reset.c:77
+#: builtin/reset.c:78
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:79
+#: builtin/reset.c:80
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指�的树。"
 
-#: builtin/reset.c:85
+#: builtin/reset.c:86
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指�的树。"
 
-#: builtin/reset.c:103
+#: builtin/reset.c:113
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在�于 %s"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:186
+#: builtin/reset.c:197
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�并过程中�能�%s�置�作。"
 
-#: builtin/reset.c:286
+#: builtin/reset.c:297
 msgid "be quiet, only report errors"
 msgstr "安�模�，�报告错误"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:299
 msgid "reset HEAD and index"
 msgstr "�置 HEAD 和索引"
 
-#: builtin/reset.c:289
+#: builtin/reset.c:300
 msgid "reset only HEAD"
 msgstr "��置 HEAD"
 
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
 msgid "reset HEAD, index and working tree"
 msgstr "�置 HEAD�索引和工作区"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:306
 msgid "reset HEAD but keep local changes"
 msgstr "�置 HEAD 但�存本地�更"
 
-#: builtin/reset.c:301
+#: builtin/reset.c:312
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为��添加"
 
-#: builtin/reset.c:320
+#: builtin/reset.c:329
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解�为一个有效的版本。"
 
-#: builtin/reset.c:328
+#: builtin/reset.c:337
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解�为一个有效的树对象。"
 
-#: builtin/reset.c:337
+#: builtin/reset.c:346
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 与 --{hard�mixed�soft} 选项�兼容"
 
-#: builtin/reset.c:346
+#: builtin/reset.c:355
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:348
+#: builtin/reset.c:357
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能带路径进行%s�置。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:358
+#: builtin/reset.c:367
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能对纯仓库进行%s�置"
 
-#: builtin/reset.c:362
+#: builtin/reset.c:371
 msgid "-N can only be used with --mixed"
 msgstr "-N �能和 --mixed �时使用"
 
-#: builtin/reset.c:379
+#: builtin/reset.c:388
 msgid "Unstaged changes after reset:"
 msgstr "�置��消暂存的�更："
 
-#: builtin/reset.c:385
+#: builtin/reset.c:394
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:389
+#: builtin/reset.c:398
 msgid "Could not write new index file."
 msgstr "�能写入新的索引文件。"
 
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
 msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�显示注解"
 
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<�数>...]"
 
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
 msgid "keep the `--` passed as an arg"
 msgstr "�� `--` 作为一个�数传递"
 
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
 msgid "stop parsing after the first non-option argument"
 msgstr "�到第一个�选项�数��止解�"
 
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
 msgid "output in stuck long form"
 msgstr "以固定长格�输出"
 
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12665,11 +12859,11 @@ msgstr "�许�交说明为空"
 msgid "keep redundant, empty commits"
 msgstr "��多余的�空的�交"
 
-#: builtin/revert.c:212
+#: builtin/revert.c:214
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c:225
+#: builtin/revert.c:227
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
@@ -12735,17 +12929,17 @@ msgstr "�许递归删除"
 msgid "exit with a zero status even if nothing matched"
 msgstr "�使没有匹�，也以零状�退出"
 
-#: builtin/rm.c:308
+#: builtin/rm.c:307
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未�供 -r 选项�会递归删除 '%s'"
 
-#: builtin/rm.c:347
+#: builtin/rm.c:346
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：�能删除 %s"
 
-#: builtin/rm.c:370
+#: builtin/rm.c:369
 #, c-format
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
@@ -12781,27 +12975,27 @@ msgstr "打��自远程 helper 的状�"
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
 
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
 msgid "Group by committer rather than author"
 msgstr "按照�交者分组而�是作者"
 
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
 msgid "sort output according to the number of commits per author"
 msgstr "根��个作者的�交数�排�"
 
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "���交说明，��供�交数�"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
 msgid "Show the email address of each author"
 msgstr "显示�个作者的电�邮件地�"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
 msgid "Linewrap output"
 msgstr "折行输出"
 
@@ -12999,115 +13193,115 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用�称，�得到 %s"
 
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到�模组 '%s' 的 url"
 
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
 
 #
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议�模组 '%s' 使用命令更新模�\n"
 
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册更新模�"
 
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
 msgid "Suppress output for initializing a submodule"
 msgstr "�始化�模组时抑制输出"
 
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<路径>]"
 
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有�现路径 '%s' 的�模组映射"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "�模组 '%s' �能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能识别 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�能识别 submodule.alternateLocaion 的�值 '%s'"
 
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13115,102 +13309,102 @@ msgstr ""
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
 "[--name <�字>] [--depth <深度>] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到�模组路径 '%s'"
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的�模组目录"
 
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模组 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想�执行 'update --init'？"
 
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未�并的�模组 %s"
 
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过�模组 '%s'"
 
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划�试"
 
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次�试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套�模组"
 
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
 msgid "rebase, merge, checkout or none"
 msgstr "rebase�merge�checkout 或 none"
 
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
 msgid "parallel jobs"
 msgstr "并�任务"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始克隆是�应该�守推�的浅克隆选项"
 
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
 msgid "don't print cloning progress"
 msgstr "��输出克隆进度"
 
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
 msgid "bad value for update parameter"
 msgstr "update �数�值错误"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
 #, 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:1163
+#: builtin/submodule--helper.c:1214
 msgid "recurse into submodules"
 msgstr "在�模组中递归"
 
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<路径>...]"
 
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s �支� --super-prefix"
 
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一个有效的 submodule--helper �命令"
@@ -13223,23 +13417,23 @@ msgstr "git symbolic-ref [<选项>] <�称> [<引用>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <�称>"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "�显示�符�（分离的）引用的错误信�"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
 msgid "delete symbolic ref"
 msgstr "删除符�引用"
 
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
 msgid "shorten ref output"
-msgstr "简短的引用输出"
+msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
 msgid "reason of the update"
 msgstr "更新的原因"
 
@@ -13268,17 +13462,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格�>] <标签�>..."
 
-#: builtin/tag.c:84
+#: builtin/tag.c:86
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未�现标签 '%s'。"
 
-#: builtin/tag.c:100
+#: builtin/tag.c:102
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c:129
+#: builtin/tag.c:131
 #, c-format
 msgid ""
 "\n"
@@ -13291,7 +13485,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被忽略。\n"
 
-#: builtin/tag.c:133
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -13305,142 +13499,142 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被�留，如果您愿�也�以删除它们。\n"
 
-#: builtin/tag.c:211
+#: builtin/tag.c:189
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c:213
+#: builtin/tag.c:191
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
-#: builtin/tag.c:237
+#: builtin/tag.c:215
 msgid "bad object type."
 msgstr "�的对象类型。"
 
-#: builtin/tag.c:283
+#: builtin/tag.c:261
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:290
+#: builtin/tag.c:268
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被�留在 %s\n"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:376
 msgid "list tag names"
 msgstr "列出标签�称"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:378
 msgid "print <n> lines of each tag message"
 msgstr "�个标签信�打� <n> 行"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:380
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:381
 msgid "verify tags"
 msgstr "验�标签"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:383
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:385
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需�一个说明"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:387
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:389
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签�的标签"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:393
 msgid "use another key to sign the tag"
 msgstr "使用�外的�钥签�该标签"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:394
 msgid "replace the tag if exists"
 msgstr "如果存在，替�现有的标签"
 
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:397
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:398
 msgid "show tag list in columns"
 msgstr "以列的方�显示标签列表"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
 msgid "print only tags that contain the commit"
 msgstr "�打�包�该�交的标签"
 
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
 msgid "print only tags that don't contain the commit"
 msgstr "�打��包�该�交的标签"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:403
 msgid "print only tags that are merged"
 msgstr "�打�已��并的标签"
 
-#: builtin/tag.c:426
+#: builtin/tag.c:404
 msgid "print only tags that are not merged"
 msgstr "�打�尚未�并的标签"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:409
 msgid "print only tags of the object"
 msgstr "�打�指�该对象的标签"
 
-#: builtin/tag.c:470
+#: builtin/tag.c:453
 msgid "--column and -n are incompatible"
 msgstr "--column 和 -n �兼容"
 
-#: builtin/tag.c:492
+#: builtin/tag.c:475
 msgid "-n option is only allowed in list mode"
 msgstr "-n 选项��许用在列表显示模�"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:477
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:479
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:481
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 选项��许用在列表显示模�"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:483
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged 和 --no-merged 选项��许用在列表显示模�"
 
-#: builtin/tag.c:511
+#: builtin/tag.c:494
 msgid "only one -F or -m option is allowed."
 msgstr "��许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:530
+#: builtin/tag.c:513
 msgid "too many params"
 msgstr "太多�数"
 
-#: builtin/tag.c:536
+#: builtin/tag.c:519
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:541
+#: builtin/tag.c:524
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:571
+#: builtin/tag.c:554
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -13507,141 +13701,141 @@ msgstr "删除一个目录�，目录的状�信�未改�"
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
 msgid "continue refresh even when index needs update"
 msgstr "当索引需�更新时继续刷新"
 
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略�模组"
 
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
 msgid "do not ignore new files"
 msgstr "�忽略新的文件"
 
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替�目录（�之亦然）"
 
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
 msgid "refresh even if index contains unmerged entries"
 msgstr "�使索引区包�未�并的�目也执行刷新"
 
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
 msgid "refresh stat information"
 msgstr "刷新统计信�"
 
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
 msgid "<mode>,<object>,<path>"
 msgstr "<存�模�>,<对象>,<路径>"
 
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
 msgid "add the specified entry to the index"
 msgstr "添加指定的�目到索引区"
 
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有�更\""
 
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged �"
 
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree �"
 
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
 msgid "add to index only; do not add content to object database"
 msgstr "�添加到索引区；�添加对象到对象库"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
 msgid "remove named paths even if present in worktree"
 msgstr "�使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "�带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读�需�更新的路径列表"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加�目到索引区"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件�新生�第2和第3暂存区"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "only update entries that differ from HEAD"
 msgstr "�更新与 HEAD ��的�目"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
 msgid "report actions to standard output"
 msgstr "在标准输出显示�作"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记�存的未解决的冲�"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
 msgid "write index in this format"
 msgstr "以这�格�写入索引区"
 
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
 msgid "enable or disable split index"
 msgstr "�用或�用索引拆分"
 
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
 msgid "enable/disable untracked cache"
 msgstr "�用/�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是�支�未跟踪文件缓存"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 "core.splitIndex 被设置为 false。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 "core.splitIndex 被设置为 true。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13649,11 +13843,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实��用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被�用"
 
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13661,7 +13855,7 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实��用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' �用"
@@ -13678,19 +13872,19 @@ msgstr "git update-ref [<选项>]    <引用�> <新值> [<旧值>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用�> 本身而�是它指�的引用"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的�数"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
 msgid "read updates from stdin"
 msgstr "从标准输入读�更新"
 
@@ -13754,102 +13948,109 @@ msgstr "git worktree prune [<选项>]"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "删除工作区/%s：�是一个有效的目录"
 
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "删除 worktrees/%s：gitdir 文件�存在"
 
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "删除 worktrees/%s：无法读� gitdir 文件 (%s)"
 
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "删除工作树/%s：读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
+
+#: builtin/worktree.c:84
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
 
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "删除 worktrees/%s：gitdir 文件的指��存在"
 
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "将早于 <time> 的工作区过期"
 
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已�存在"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "准备 %s（标识符 %s）"
 
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出分支 <branch> �使已�被检出到其它工作区"
 
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
 msgid "create or reset a branch"
 msgstr "创建或�置一个分支"
 
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
 msgid "populate the new working tree"
 msgstr "生�新的工作区"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
 msgid "keep the new working tree locked"
 msgstr "�定新工作区"
 
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b�-B 和 --detach 是互斥的"
 
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
 msgid "reason for locking"
 msgstr "�定原因"
 
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' �是一个工作区"
 
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加�或解�"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被�定，原因：%s"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被�定"
 
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被�定"
@@ -13874,23 +14075,23 @@ msgstr "�对调试有用"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<选项>] <目录>"
 
-#: upload-pack.c:1041
+#: upload-pack.c:1040
 msgid "quit after a single request/response exchange"
 msgstr "在一次�独的请求/�应（request/response）交��退出"
 
-#: upload-pack.c:1043
+#: upload-pack.c:1042
 msgid "exit immediately after initial ref advertisement"
 msgstr "在�始的引用广告�立�退出"
 
-#: upload-pack.c:1045
+#: upload-pack.c:1044
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "���试 <directory>/.git/ 如果 <directory> �是一个 Git 目录"
 
-#: upload-pack.c:1047
+#: upload-pack.c:1046
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "�活动 <n> 秒钟�终止传输"
 
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13903,7 +14104,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
 msgid "print debugging messages to stderr"
 msgstr "调试信�输出到标准错误"
 
@@ -13917,20 +14118,20 @@ msgstr ""
 "查看 'git help <命令>' 或 'git help <概念>' 以获�给定�命令或概念的\n"
 "帮助。"
 
-#: http.c:337
+#: http.c:338
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:358
+#: http.c:359
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "当 cURL < 7.22.0 时，�支�委托控制"
 
-#: http.c:367
+#: http.c:368
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "�支�公钥文件�定，因为 cURL < 7.44.0"
 
-#: http.c:1764
+#: http.c:1768
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14292,7 +14493,7 @@ msgstr "无法找到和 $pretty_name 的基线�交"
 
 #: git-merge-octopus.sh:77
 #, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
 msgstr "已�和 $pretty_name ��一致"
 
 #: git-merge-octopus.sh:89
@@ -14311,50 +14512,52 @@ msgstr "简��并未生效，�试自动�并。"
 
 #: git-rebase.sh:58
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"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\"."
 msgstr ""
-"当您解决了此问题�，执行 \"git rebase --continue\"。\n"
-"如果您想跳过此补�，则执行 \"git rebase --skip\"。\n"
-"���原分支并�止�基，执行 \"git rebase --abort\"。"
+"手工解决所有冲�，执行 \"git add/rm <conflicted_files>\" 标记\n"
+"冲�已解决，然�执行 \"git rebase --continue\"。您也�以执行\n"
+"\"git rebase --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
+"\"git rebase\" 执行之�的状�，执行 \"git rebase --abort\"。"
 
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "无法移回 $head_name"
 
-#: git-rebase.sh:169
+#: git-rebase.sh:171
 msgid "Applied autostash."
 msgstr "�功应用 autostash。"
 
-#: git-rebase.sh:172
+#: git-rebase.sh:174
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "无法�存 $stash_sha1"
 
-#: git-rebase.sh:212
+#: git-rebase.sh:214
 msgid "The pre-rebase hook refused to rebase."
 msgstr "钩� pre-rebase 拒��基�作。"
 
-#: git-rebase.sh:217
+#: git-rebase.sh:219
 msgid "It looks like git-am is in progress. Cannot rebase."
 msgstr "似乎正处于在 git-am 的执行过程中。无法�基。"
 
-#: git-rebase.sh:358
+#: git-rebase.sh:363
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
 
-#: git-rebase.sh:369
+#: git-rebase.sh:374
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo �能用在交互��基过程中。"
 
-#: git-rebase.sh:376
+#: git-rebase.sh:381
 msgid "Cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: git-rebase.sh:379
+#: git-rebase.sh:384
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -14362,7 +14565,7 @@ msgstr ""
 "您必须编辑所有的�并冲�，然�通过 git add\n"
 "命令将它们标记为已解决"
 
-#: git-rebase.sh:419
+#: git-rebase.sh:424
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14381,101 +14584,101 @@ msgstr ""
 "\t$cmd_clear_stale_rebase\n"
 "然���新执行�基�作。 为��丢失��数�，我已��止当��作。"
 
-#: git-rebase.sh:470
+#: git-rebase.sh:480
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr "无效的上游 $upstream_name"
 
-#: git-rebase.sh:494
+#: git-rebase.sh:504
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 有一个以上的�并基准"
 
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 没有�并基准"
 
-#: git-rebase.sh:506
+#: git-rebase.sh:516
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "没有指�一个有效的�交：$onto_name"
 
-#: git-rebase.sh:529
+#: git-rebase.sh:539
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr "严�错误：无此分支：$branch_name"
 
-#: git-rebase.sh:562
+#: git-rebase.sh:572
 msgid "Cannot autostash"
 msgstr "无法 autostash"
 
-#: git-rebase.sh:567
+#: git-rebase.sh:577
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "创建了 autostash: $stash_abbrev"
 
-#: git-rebase.sh:571
+#: git-rebase.sh:581
 msgid "Please commit or stash them."
 msgstr "请�交或贮�修改。"
 
-#: git-rebase.sh:591
+#: git-rebase.sh:601
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "当�分支 $branch_name 是最新的。"
 
-#: git-rebase.sh:595
+#: git-rebase.sh:605
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "当�分支 $branch_name 是最新的，强制�基。"
 
-#: git-rebase.sh:606
+#: git-rebase.sh:616
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "�更从 $mb 到 $onto："
 
-#: git-rebase.sh:615
+#: git-rebase.sh:625
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "首先，回退分支以便在上��放您的工作..."
 
-#: git-rebase.sh:625
+#: git-rebase.sh:635
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "快进 $branch_name 至 $onto_name。"
 
-#: git-stash.sh:54
+#: git-stash.sh:61
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear �支��数"
 
-#: git-stash.sh:95
+#: git-stash.sh:102
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: git-stash.sh:110
+#: git-stash.sh:117
 msgid "Cannot save the current index state"
 msgstr "无法�存当�索引状�"
 
-#: git-stash.sh:125
+#: git-stash.sh:132
 msgid "Cannot save the untracked files"
 msgstr "无法�存未跟踪文件"
 
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
 msgid "Cannot save the current worktree state"
 msgstr "无法�存当�工作区状�"
 
-#: git-stash.sh:162
+#: git-stash.sh:169
 msgid "No changes selected"
 msgstr "没有选择�更"
 
-#: git-stash.sh:165
+#: git-stash.sh:172
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "无法删除临时索引（�应�生）"
 
-#: git-stash.sh:178
+#: git-stash.sh:185
 msgid "Cannot record working tree state"
 msgstr "�能记录工作区状�"
 
-#: git-stash.sh:210
+#: git-stash.sh:217
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "无法用 $w_commit 更新 $ref_stash"
@@ -14490,7 +14693,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash"
 #. $ 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:266
+#: git-stash.sh:273
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14499,107 +14702,107 @@ msgstr ""
 "错误：'stash save' 的未知选项：$option\n"
 "      ��供一个�述信�，使用 git stash save -- '$option'"
 
-#: git-stash.sh:281
+#: git-stash.sh:288
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�能�时使用�数 --patch 和 --include-untracked 或 --all"
 
-#: git-stash.sh:289
+#: git-stash.sh:296
 msgid "No local changes to save"
 msgstr "没有��存的本地修改"
 
-#: git-stash.sh:294
+#: git-stash.sh:301
 msgid "Cannot initialize stash"
 msgstr "无法�始化贮�"
 
-#: git-stash.sh:298
+#: git-stash.sh:305
 msgid "Cannot save the current status"
 msgstr "无法�存当�状�"
 
-#: git-stash.sh:299
+#: git-stash.sh:306
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "�存工作目录和索引状� $stash_msg"
 
-#: git-stash.sh:326
+#: git-stash.sh:334
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区�更"
 
-#: git-stash.sh:474
+#: git-stash.sh:482
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "未知选项: $opt"
 
-#: git-stash.sh:487
+#: git-stash.sh:495
 msgid "No stash entries found."
 msgstr "未�现贮��目。"
 
-#: git-stash.sh:494
+#: git-stash.sh:502
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "指定了太多的版本：$REV"
 
-#: git-stash.sh:509
+#: git-stash.sh:517
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference �是一个有效的引用"
 
-#: git-stash.sh:537
+#: git-stash.sh:545
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' �是贮���交"
 
-#: git-stash.sh:548
+#: git-stash.sh:556
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' �是一个贮�引用"
 
-#: git-stash.sh:556
+#: git-stash.sh:564
 msgid "unable to refresh index"
 msgstr "无法刷新索引"
 
-#: git-stash.sh:560
+#: git-stash.sh:568
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "无法在�并过程应用贮�"
 
-#: git-stash.sh:568
+#: git-stash.sh:576
 msgid "Conflicts in index. Try without --index."
 msgstr "索引中有冲�。�试�使用 --index。"
 
-#: git-stash.sh:570
+#: git-stash.sh:578
 msgid "Could not save index tree"
 msgstr "�能�存索引树"
 
-#: git-stash.sh:579
+#: git-stash.sh:587
 msgid "Could not restore untracked files from stash entry"
 msgstr "无法从贮��目中��未跟踪文件"
 
-#: git-stash.sh:604
+#: git-stash.sh:612
 msgid "Cannot unstage modified files"
 msgstr "无法将修改的文件�消暂存"
 
-#: git-stash.sh:619
+#: git-stash.sh:627
 msgid "Index was not unstashed."
 msgstr "索引未从贮�中��。"
 
-#: git-stash.sh:633
+#: git-stash.sh:641
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮��目被�留以备您�次需�。"
 
-#: git-stash.sh:642
+#: git-stash.sh:650
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "丢弃了 ${REV} ($s)"
 
-#: git-stash.sh:643
+#: git-stash.sh:651
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}：无法丢弃贮��目"
 
-#: git-stash.sh:651
+#: git-stash.sh:659
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: git-stash.sh:730
+#: git-stash.sh:738
 msgid "(To restore them type \"git stash apply\")"
 msgstr "（为��数�输入 \"git stash apply\"）"
 
@@ -14739,29 +14942,29 @@ msgstr "�能创建空的�模组目录 '$displaypath'"
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "�模组 '$name' ($url) 未对路径 '$displaypath' 注册"
 
-#: git-submodule.sh:638
+#: git-submodule.sh:637
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中找到当�版本"
 
-#: git-submodule.sh:648
+#: git-submodule.sh:647
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中获�"
 
-#: git-submodule.sh:653
+#: git-submodule.sh:652
 #, 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:671
+#: git-submodule.sh:670
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中获�"
 
-#: git-submodule.sh:677
+#: git-submodule.sh:676
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14769,84 +14972,84 @@ msgid ""
 msgstr ""
 "获�了�模组路径 '$displaypath'，但是它没有包� $sha1。直接获�该�交失败。"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:683
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:685
+#: git-submodule.sh:684
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:688
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中�基 '$sha1'"
 
-#: git-submodule.sh:690
+#: git-submodule.sh:689
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�模组路径 '$displaypath'：�基至 '$sha1'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:694
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法�并 '$sha1' 到�模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:696
+#: git-submodule.sh:695
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�模组路径 '$displaypath'：已�并入 '$sha1'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:700
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "在�模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:702
+#: git-submodule.sh:701
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:733
+#: git-submodule.sh:732
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进�模组路径 '$displaypath'"
 
-#: git-submodule.sh:841
+#: git-submodule.sh:840
 msgid "The --cached option cannot be used with the --files option"
 msgstr "选项 --cached �能和选项 --files �时使用"
 
-#: git-submodule.sh:893
+#: git-submodule.sh:892
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "�外的模� $mod_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:913
+#: git-submodule.sh:912
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包��交 $sha1_src"
 
 #  译者：注����导空格
-#: git-submodule.sh:916
+#: git-submodule.sh:915
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包��交 $sha1_dst"
 
 #  译者：注����导空格
-#: git-submodule.sh:919
+#: git-submodule.sh:918
 #, 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:1065
+#: git-submodule.sh:1064
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "无法递归进�模组路径 '$sm_path'"
 
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "为 '$displaypath' �步�模组 url"
@@ -14865,28 +15068,27 @@ msgstr "�基中（$new_count/$total）"
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 "\n"
 "命令:\n"
-" p, pick = 使用�交\n"
-" r, reword = 使用�交，但修改�交说明\n"
-" e, edit = 使用�交，但�止以便进行�交修补\n"
-" s, squash = 使用�交，但和�一个版本��\n"
-" f, fixup = 类似于 \"squash\"，但丢弃�交说明日志\n"
-" x, exec = 使用 shell �行命令（此行剩余部分）\n"
-" d, drop = 删除�交\n"
+"p, pick = 使用�交\n"
+"r, reword = 使用�交，但修改�交说明\n"
+"e, edit = 使用�交，但�止以便进行�交修补\n"
+"s, squash = 使用�交，但和�一个版本��\n"
+"f, fixup = 类似于 \"squash\"，但丢弃�交说明日志\n"
+"x, exec = 使用 shell �行命令（此行剩余部分）\n"
+"d, drop = 删除�交\n"
 "\n"
 "这些行�以被�新排�；它们会被从上至下地执行。\n"
-"\n"
 
 #: git-rebase--interactive.sh:171
 msgid ""
@@ -14957,49 +15159,49 @@ msgstr "�能移动 HEAD 到 $first_parent"
 msgid "Refusing to squash a merge: $sha1"
 msgstr "拒�压缩一个�并：$sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "无法���并 $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "�能拣选 $sha1"
 
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "这是�交说明 #${n}："
 
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "�交说明 #${n} 将被跳过："
 
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
 #, 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:441
+#: git-rebase--interactive.sh:442
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�能写入 $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
 msgid "This is a combination of 2 commits."
 msgstr "这是一个 2 个�交的组�。"
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "�能应用 $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15012,32 +15214,32 @@ msgstr ""
 "这通常是因为空的�交说明，或者 pre-commit 钩�执行失败。如果是 pre-commit\n"
 "钩�执行失败，你�能需�在�写�交说明�解决这个问题。"
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "�止在 $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "没有父�交的情况下�能 '$squash_style'"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
 #, sh-format
 msgid "Executing: $rest"
 msgstr "执行：$rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "执行失败：$rest"
 
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
 msgid "and made changes to the index and/or the working tree"
 msgstr "并且修改索引和/或工作区"
 
 #  译者：注����导空格
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -15048,7 +15250,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15062,88 +15264,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "未知命令：$command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "�修改请使用命令 'git rebase --edit-todo'。"
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "�功�基并更新 $head_name。"
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "�能跳过�必�的拣选命令"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"警告：缺失 SHA-1 或者在下�一行中�是一个�交：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"警告：下�一行中的命令未能被识别：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
 msgid "could not detach HEAD"
 msgstr "�能检出为分离头指针"
 
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr "警告：一些�交�能被�外丢弃。丢弃的�交（从新到旧）："
-
-#: git-rebase--interactive.sh:1026
-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"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"为��这�信�，使用 \"drop\" 指令显�地删除一个�交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' �修改警告级别。\n"
-"�选值有：ignore�warn�error。"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"您�以用 'git rebase --edit-todo' 修正问题然�执行 'git rebase --continue'。"
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "或者您�以使用 'git rebase --abort' 命令终止�基�作。"
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15172,22 +15315,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
 msgid "Error trying to find the author identity to amend commit"
 msgstr "在修补�交中查找作者信�时�到错误"
 
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
 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:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
 msgid "Could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15196,45 +15339,45 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"您正在修改�行中的交互��基的 todo 文件。若�在编辑结��继续�基，\n"
+"您正在修改�行中的交互��基待办列表。若�在编辑结��继续�基，\n"
 "请执行：\n"
 "    git rebase --continue\n"
 "\n"
 
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
 msgid "Could not execute editor"
 msgstr "无法�行编辑器"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "�能检出 $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
 msgid "No HEAD?"
 msgstr "没有 HEAD？"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "�能创建临时 $state_dir"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
 msgid "Could not mark as interactive"
 msgstr "�能标记为交互�"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
 msgid "Could not init rewritten commits"
 msgstr "�能对�写�交进行�始化"
 
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
 #, 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:1296
+#: git-rebase--interactive.sh:998
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15244,7 +15387,7 @@ msgstr ""
 "然而，如果您删除全部内容，�基�作将会终止。\n"
 "\n"
 
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
 msgid "Note that empty commits are commented out"
 msgstr "注�空�交已被注释掉"
 
@@ -15807,60 +15950,60 @@ msgstr "本地时间和 GMT 有�到一分钟间隔\n"
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间�移�大于等于 24 �时\n"
 
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器�正常退出，终止所有�作"
 
-#: git-send-email.perl:291
+#: git-send-email.perl:290
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包�您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:296
+#: git-send-email.perl:295
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�编辑的邮件。\n"
 
-#: git-send-email.perl:314
+#: git-send-email.perl:313
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项�兼容\n"
 
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�能在仓库之外�行 git format-patch\n"
 
-#: git-send-email.perl:448
+#: git-send-email.perl:447
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:477
+#: git-send-email.perl:476
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:509
+#: git-send-email.perl:504
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：�支�带引�的 sendmail 别�：%s\n"
 
-#: git-send-email.perl:511
+#: git-send-email.perl:506
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:513
+#: git-send-email.perl:508
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
 
-#: git-send-email.perl:518
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:600
+#: git-send-email.perl:595
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15875,12 +16018,12 @@ msgstr ""
 "    * 如果�义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果�义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:616
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:640
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -15889,7 +16032,7 @@ msgstr ""
 "严�：%s：%s\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:656
+#: git-send-email.perl:651
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -15899,17 +16042,17 @@ msgstr ""
 "未指定补�文件�\n"
 "\n"
 
-#: git-send-email.perl:669
+#: git-send-email.perl:664
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:679
+#: git-send-email.perl:674
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "无法写入 %s: %s"
 
-#: git-send-email.perl:689
+#: git-send-email.perl:684
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15922,41 +16065,41 @@ msgstr ""
 "\n"
 "如果您�想��摘�，清除内容。\n"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:707
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:715
+#: git-send-email.perl:710
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:750
+#: 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:759
+#: git-send-email.perl:754
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘�邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认�使用 <%s> [y/N]？"
 
-#: git-send-email.perl:820
+#: git-send-email.perl:815
 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:825
+#: git-send-email.perl:820
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�声明 8bit 为什么样的编�格� [UTF-8]？"
 
-#: git-send-email.perl:833
+#: git-send-email.perl:828
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15968,20 +16111,20 @@ msgstr ""
 "\t%s\n"
 "包�模版标题 '*** SUBJECT HERE ***'。如果确实想���，使用�数 --force。\n"
 
-#: git-send-email.perl:852
+#: git-send-email.perl:847
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将���给�？"
 
-#: git-send-email.perl:870
+#: git-send-email.perl:865
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "严�：别� '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:882
+#: git-send-email.perl:877
 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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：�能从 %s 中��一个有效的邮件地�\n"
@@ -15989,16 +16132,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:944
+#: git-send-email.perl:939
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处�这个地�？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" �存在"
 
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16023,128 +16166,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:1335
+#: git-send-email.perl:1350
 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:1338
+#: git-send-email.perl:1353
 msgid "Send this email reply required"
 msgstr "���求的邮件回�"
 
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP �务器未被正确定义。"
 
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "�务器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败�%s"
 
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地�始化 SMTP。检查�置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法�� %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习�� %s\n"
 
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正�� %s\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "Dry-OK. Log says:\n"
 msgstr "演习�功。日志说：\n"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能执行 '%s'"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管�至 '%s'"
 
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形���信�"
 
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
 msgid "invalid transfer encoding"
 msgstr "无效的传�编�"
 
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "�能打开 %s：%s\n"
 
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s：补�包�一个超过 998 字符的行"
 
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
 #, 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:1818
+#: git-send-email.perl:1835
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的��� %s？[y|N]："
diff --git a/pretty.c b/pretty.c
index 39cad5112..2f6b0ae6c 100644
--- a/pretty.c
+++ b/pretty.c
@@ -871,16 +871,6 @@ const char *format_subject(struct strbuf *sb, const char *msg,
 	return msg;
 }
 
-static void format_trailers(struct strbuf *sb, const char *msg)
-{
-	struct trailer_info info;
-
-	trailer_info_get(&info, msg);
-	strbuf_add(sb, info.trailer_start,
-		   info.trailer_end - info.trailer_start);
-	trailer_info_release(&info);
-}
-
 static void parse_commit_message(struct format_commit_context *c)
 {
 	const char *msg = c->message + c->message_off;
@@ -1066,6 +1056,24 @@ static size_t parse_padding_placeholder(struct strbuf *sb,
 	return 0;
 }
 
+static int match_placeholder_arg(const char *to_parse, const char *candidate,
+				 const char **end)
+{
+	const char *p;
+
+	if (!(skip_prefix(to_parse, candidate, &p)))
+		return 0;
+	if (*p == ',') {
+		*end = p + 1;
+		return 1;
+	}
+	if (*p == ')') {
+		*end = p;
+		return 1;
+	}
+	return 0;
+}
+
 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 				const char *placeholder,
 				void *context)
@@ -1074,6 +1082,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 	const struct commit *commit = c->commit;
 	const char *msg = c->message;
 	struct commit_list *p;
+	const char *arg;
 	int ch;
 
 	/* these are independent of the commit */
@@ -1292,9 +1301,23 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		return 1;
 	}
 
-	if (starts_with(placeholder, "(trailers)")) {
-		format_trailers(sb, msg + c->subject_off);
-		return strlen("(trailers)");
+	if (skip_prefix(placeholder, "(trailers", &arg)) {
+		struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+		if (*arg == ':') {
+			arg++;
+			for (;;) {
+				if (match_placeholder_arg(arg, "only", &arg))
+					opts.only_trailers = 1;
+				else if (match_placeholder_arg(arg, "unfold", &arg))
+					opts.unfold = 1;
+				else
+					break;
+			}
+		}
+		if (*arg == ')') {
+			format_trailers_from_commit(sb, msg + c->subject_off, &opts);
+			return arg - placeholder + 1;
+		}
 	}
 
 	return 0;	/* unknown placeholder */
diff --git a/progress.c b/progress.c
index 73e36d4a4..289678d43 100644
--- a/progress.c
+++ b/progress.c
@@ -34,7 +34,7 @@ struct progress {
 	unsigned total;
 	unsigned last_percent;
 	unsigned delay;
-	unsigned delayed_percent_treshold;
+	unsigned delayed_percent_threshold;
 	struct throughput *throughput;
 	uint64_t start_ns;
 };
@@ -88,7 +88,7 @@ static int display(struct progress *progress, unsigned n, const char *done)
 			return 0;
 		if (progress->total) {
 			unsigned percent = n * 100 / progress->total;
-			if (percent > progress->delayed_percent_treshold) {
+			if (percent > progress->delayed_percent_threshold) {
 				/* inhibit this progress report entirely */
 				clear_progress_signal();
 				progress->delay = -1;
@@ -205,8 +205,8 @@ int display_progress(struct progress *progress, unsigned n)
 	return progress ? display(progress, n, NULL) : 0;
 }
 
-struct progress *start_progress_delay(const char *title, unsigned total,
-				       unsigned percent_treshold, unsigned delay)
+static struct progress *start_progress_delay(const char *title, unsigned total,
+					     unsigned percent_threshold, unsigned delay)
 {
 	struct progress *progress = malloc(sizeof(*progress));
 	if (!progress) {
@@ -219,7 +219,7 @@ struct progress *start_progress_delay(const char *title, unsigned total,
 	progress->total = total;
 	progress->last_value = -1;
 	progress->last_percent = -1;
-	progress->delayed_percent_treshold = percent_treshold;
+	progress->delayed_percent_threshold = percent_threshold;
 	progress->delay = delay;
 	progress->throughput = NULL;
 	progress->start_ns = getnanotime();
@@ -227,6 +227,11 @@ struct progress *start_progress_delay(const char *title, unsigned total,
 	return progress;
 }
 
+struct progress *start_delayed_progress(const char *title, unsigned total)
+{
+	return start_progress_delay(title, total, 0, 2);
+}
+
 struct progress *start_progress(const char *title, unsigned total)
 {
 	return start_progress_delay(title, total, 0, 0);
diff --git a/progress.h b/progress.h
index 611e4c4d4..6392b6337 100644
--- a/progress.h
+++ b/progress.h
@@ -6,8 +6,7 @@ struct progress;
 void display_throughput(struct progress *progress, off_t total);
 int display_progress(struct progress *progress, unsigned n);
 struct progress *start_progress(const char *title, unsigned total);
-struct progress *start_progress_delay(const char *title, unsigned total,
-				       unsigned percent_treshold, unsigned delay);
+struct progress *start_delayed_progress(const char *title, unsigned total);
 void stop_progress(struct progress **progress);
 void stop_progress_msg(struct progress **progress, const char *msg);
 
diff --git a/quote.c b/quote.c
index 53b98a5b8..de2922ddd 100644
--- a/quote.c
+++ b/quote.c
@@ -431,6 +431,7 @@ void tcl_quote_buf(struct strbuf *sb, const char *src)
 		case '{': case '}':
 		case '$': case '\\': case '"':
 			strbuf_addch(sb, '\\');
+			/* fallthrough */
 		default:
 			strbuf_addch(sb, c);
 			break;
diff --git a/reachable.c b/reachable.c
index c62efbfd4..88d7d679d 100644
--- a/reachable.c
+++ b/reachable.c
@@ -9,6 +9,8 @@
 #include "cache-tree.h"
 #include "progress.h"
 #include "list-objects.h"
+#include "packfile.h"
+#include "worktree.h"
 
 struct connectivity_progress {
 	struct progress *progress;
@@ -176,6 +178,7 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 
 	/* detached HEAD is not included in the list above */
 	head_ref(add_one_ref, revs);
+	other_head_refs(add_one_ref, revs);
 
 	/* Add all reflog info */
 	if (mark_reflog)
diff --git a/read-cache.c b/read-cache.c
index acfb028f4..65f4fe837 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -160,9 +160,9 @@ static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
 	int fd = git_open_cloexec(ce->name, O_RDONLY);
 
 	if (fd >= 0) {
-		unsigned char sha1[20];
-		if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
-			match = hashcmp(sha1, ce->oid.hash);
+		struct object_id oid;
+		if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
+			match = oidcmp(&oid, &ce->oid);
 		/* index_fd() closed the file descriptor already */
 	}
 	return match;
@@ -220,6 +220,7 @@ static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
 	case S_IFDIR:
 		if (S_ISGITLINK(ce->ce_mode))
 			return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
+		/* else fallthrough */
 	default:
 		return TYPE_CHANGED;
 	}
@@ -689,7 +690,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 		return 0;
 	}
 	if (!intent_only) {
-		if (index_path(ce->oid.hash, path, st, HASH_WRITE_OBJECT)) {
+		if (index_path(&ce->oid, path, st, HASH_WRITE_OBJECT)) {
 			free(ce);
 			return error("unable to index file %s", path);
 		}
@@ -1499,6 +1500,7 @@ struct ondisk_cache_entry_extended {
 };
 
 /* These are only used for v3 or lower */
+#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
 #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
 #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
 #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
@@ -1921,7 +1923,7 @@ static int ce_write_flush(git_SHA_CTX *context, int fd)
 	unsigned int buffered = write_buffer_len;
 	if (buffered) {
 		git_SHA1_Update(context, write_buffer, buffered);
-		if (write_in_full(fd, write_buffer, buffered) != buffered)
+		if (write_in_full(fd, write_buffer, buffered) < 0)
 			return -1;
 		write_buffer_len = 0;
 	}
@@ -1970,7 +1972,7 @@ static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
 
 	/* Flush first if not enough space for SHA1 signature */
 	if (left + 20 > WRITE_BUFFER_SIZE) {
-		if (write_in_full(fd, write_buffer, left) != left)
+		if (write_in_full(fd, write_buffer, left) < 0)
 			return -1;
 		left = 0;
 	}
@@ -1979,7 +1981,7 @@ static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
 	git_SHA1_Final(write_buffer + left, context);
 	hashcpy(sha1, write_buffer + left);
 	left += 20;
-	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
+	return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0;
 }
 
 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
@@ -2032,7 +2034,7 @@ static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
 }
 
 /* Copy miscellaneous fields but not the name */
-static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
+static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
 				       struct cache_entry *ce)
 {
 	short flags;
@@ -2056,32 +2058,35 @@ static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
 		struct ondisk_cache_entry_extended *ondisk2;
 		ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
 		ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
-		return ondisk2->name;
-	}
-	else {
-		return ondisk->name;
 	}
 }
 
 static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
-			  struct strbuf *previous_name)
+			  struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
 {
 	int size;
-	struct ondisk_cache_entry *ondisk;
 	int saved_namelen = saved_namelen; /* compiler workaround */
-	char *name;
 	int result;
+	static unsigned char padding[8] = { 0x00 };
 
 	if (ce->ce_flags & CE_STRIP_NAME) {
 		saved_namelen = ce_namelen(ce);
 		ce->ce_namelen = 0;
 	}
 
+	if (ce->ce_flags & CE_EXTENDED)
+		size = offsetof(struct ondisk_cache_entry_extended, name);
+	else
+		size = offsetof(struct ondisk_cache_entry, name);
+
 	if (!previous_name) {
-		size = ondisk_ce_size(ce);
-		ondisk = xcalloc(1, size);
-		name = copy_cache_entry_to_ondisk(ondisk, ce);
-		memcpy(name, ce->name, ce_namelen(ce));
+		int len = ce_namelen(ce);
+		copy_cache_entry_to_ondisk(ondisk, ce);
+		result = ce_write(c, fd, ondisk, size);
+		if (!result)
+			result = ce_write(c, fd, ce->name, len);
+		if (!result)
+			result = ce_write(c, fd, padding, align_padding_size(size, len));
 	} else {
 		int common, to_remove, prefix_size;
 		unsigned char to_remove_vi[16];
@@ -2094,16 +2099,14 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
 		to_remove = previous_name->len - common;
 		prefix_size = encode_varint(to_remove, to_remove_vi);
 
-		if (ce->ce_flags & CE_EXTENDED)
-			size = offsetof(struct ondisk_cache_entry_extended, name);
-		else
-			size = offsetof(struct ondisk_cache_entry, name);
-		size += prefix_size + (ce_namelen(ce) - common + 1);
-
-		ondisk = xcalloc(1, size);
-		name = copy_cache_entry_to_ondisk(ondisk, ce);
-		memcpy(name, to_remove_vi, prefix_size);
-		memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
+		copy_cache_entry_to_ondisk(ondisk, ce);
+		result = ce_write(c, fd, ondisk, size);
+		if (!result)
+			result = ce_write(c, fd, to_remove_vi, prefix_size);
+		if (!result)
+			result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
+		if (!result)
+			result = ce_write(c, fd, padding, 1);
 
 		strbuf_splice(previous_name, common, to_remove,
 			      ce->name + common, ce_namelen(ce) - common);
@@ -2113,8 +2116,6 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
 		ce->ce_flags &= ~CE_STRIP_NAME;
 	}
 
-	result = ce_write(c, fd, ondisk, size);
-	free(ondisk);
 	return result;
 }
 
@@ -2192,10 +2193,11 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	int newfd = tempfile->fd;
 	git_SHA_CTX c;
 	struct cache_header hdr;
-	int i, err, removed, extended, hdr_version;
+	int i, err = 0, removed, extended, hdr_version;
 	struct cache_entry **cache = istate->cache;
 	int entries = istate->cache_nr;
 	struct stat st;
+	struct ondisk_cache_entry_extended ondisk;
 	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
 	int drop_cache_tree = 0;
 
@@ -2232,6 +2234,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		return -1;
 
 	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
+
 	for (i = 0; i < entries; i++) {
 		struct cache_entry *ce = cache[i];
 		if (ce->ce_flags & CE_REMOVE)
@@ -2247,15 +2250,21 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 			if (allow)
 				warning(msg, ce->name);
 			else
-				return error(msg, ce->name);
+				err = error(msg, ce->name);
 
 			drop_cache_tree = 1;
 		}
-		if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
-			return -1;
+		if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
+			err = -1;
+
+		if (err)
+			break;
 	}
 	strbuf_release(&previous_name_buf);
 
+	if (err)
+		return err;
+
 	/* Write extension data here */
 	if (!strip_extensions && istate->split_index) {
 		struct strbuf sb = STRBUF_INIT;
@@ -2303,8 +2312,11 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 
 	if (ce_flush(&c, newfd, istate->sha1))
 		return -1;
-	if (close_tempfile(tempfile))
-		return error(_("could not close '%s'"), tempfile->filename.buf);
+	if (close_tempfile_gently(tempfile)) {
+		error(_("could not close '%s'"), tempfile->filename.buf);
+		delete_tempfile(&tempfile);
+		return -1;
+	}
 	if (stat(tempfile->filename.buf, &st))
 		return -1;
 	istate->timestamp.sec = (unsigned int)st.st_mtime;
@@ -2328,7 +2340,7 @@ static int commit_locked_index(struct lock_file *lk)
 static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
 				 unsigned flags)
 {
-	int ret = do_write_index(istate, &lock->tempfile, 0);
+	int ret = do_write_index(istate, lock->tempfile, 0);
 	if (ret)
 		return ret;
 	assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
@@ -2336,7 +2348,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
 	if (flags & COMMIT_LOCK)
 		return commit_locked_index(lock);
 	else if (flags & CLOSE_LOCK)
-		return close_lock_file(lock);
+		return close_lock_file_gently(lock);
 	else
 		return ret;
 }
@@ -2411,34 +2423,33 @@ static int clean_shared_index_files(const char *current_hex)
 	return 0;
 }
 
-static struct tempfile temporary_sharedindex;
-
 static int write_shared_index(struct index_state *istate,
 			      struct lock_file *lock, unsigned flags)
 {
+	struct tempfile *temp;
 	struct split_index *si = istate->split_index;
-	int fd, ret;
+	int ret;
 
-	fd = mks_tempfile(&temporary_sharedindex, git_path("sharedindex_XXXXXX"));
-	if (fd < 0) {
+	temp = mks_tempfile(git_path("sharedindex_XXXXXX"));
+	if (!temp) {
 		hashclr(si->base_sha1);
 		return do_write_locked_index(istate, lock, flags);
 	}
 	move_cache_to_base_index(istate);
-	ret = do_write_index(si->base, &temporary_sharedindex, 1);
+	ret = do_write_index(si->base, temp, 1);
 	if (ret) {
-		delete_tempfile(&temporary_sharedindex);
+		delete_tempfile(&temp);
 		return ret;
 	}
-	ret = adjust_shared_perm(get_tempfile_path(&temporary_sharedindex));
+	ret = adjust_shared_perm(get_tempfile_path(temp));
 	if (ret) {
 		int save_errno = errno;
-		error("cannot fix permission bits on %s", get_tempfile_path(&temporary_sharedindex));
-		delete_tempfile(&temporary_sharedindex);
+		error("cannot fix permission bits on %s", get_tempfile_path(temp));
+		delete_tempfile(&temp);
 		errno = save_errno;
 		return ret;
 	}
-	ret = rename_tempfile(&temporary_sharedindex,
+	ret = rename_tempfile(&temp,
 			      git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
 	if (!ret) {
 		hashcpy(si->base_sha1, si->base->sha1);
diff --git a/ref-filter.c b/ref-filter.c
index f3e53d444..e728b15b3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -82,6 +82,7 @@ static struct used_atom {
 		} remote_ref;
 		struct {
 			enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB, C_TRAILERS } option;
+			struct process_trailer_options trailer_opts;
 			unsigned int nlines;
 		} contents;
 		struct {
@@ -182,9 +183,23 @@ static void subject_atom_parser(const struct ref_format *format, struct used_ato
 
 static void trailers_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
 {
-	if (arg)
-		die(_("%%(trailers) does not take arguments"));
+	struct string_list params = STRING_LIST_INIT_DUP;
+	int i;
+
+	if (arg) {
+		string_list_split(&params, arg, ',', -1);
+		for (i = 0; i < params.nr; i++) {
+			const char *s = params.items[i].string;
+			if (!strcmp(s, "unfold"))
+				atom->u.contents.trailer_opts.unfold = 1;
+			else if (!strcmp(s, "only"))
+				atom->u.contents.trailer_opts.only_trailers = 1;
+			else
+				die(_("unknown %%(trailers) argument: %s"), s);
+		}
+	}
 	atom->u.contents.option = C_TRAILERS;
+	string_list_clear(&params, 0);
 }
 
 static void contents_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
@@ -197,9 +212,10 @@ static void contents_atom_parser(const struct ref_format *format, struct used_at
 		atom->u.contents.option = C_SIG;
 	else if (!strcmp(arg, "subject"))
 		atom->u.contents.option = C_SUB;
-	else if (!strcmp(arg, "trailers"))
-		atom->u.contents.option = C_TRAILERS;
-	else if (skip_prefix(arg, "lines=", &arg)) {
+	else if (skip_prefix(arg, "trailers", &arg)) {
+		skip_prefix(arg, ":", &arg);
+		trailers_atom_parser(format, atom, *arg ? arg : NULL);
+	} else if (skip_prefix(arg, "lines=", &arg)) {
 		atom->u.contents.option = C_LINES;
 		if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
 			die(_("positive value expected contents:lines=%s"), arg);
@@ -295,9 +311,7 @@ static void if_atom_parser(const struct ref_format *format, struct used_atom *at
 
 static void head_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
 {
-	struct object_id unused;
-
-	atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, unused.hash, NULL);
+	atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
 }
 
 static struct {
@@ -1050,7 +1064,7 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
 			name++;
 		if (strcmp(name, "subject") &&
 		    strcmp(name, "body") &&
-		    strcmp(name, "trailers") &&
+		    !starts_with(name, "trailers") &&
 		    !starts_with(name, "contents"))
 			continue;
 		if (!subpos)
@@ -1075,13 +1089,12 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
 			append_lines(&s, subpos, contents_end - subpos, atom->u.contents.nlines);
 			v->s = strbuf_detach(&s, NULL);
 		} else if (atom->u.contents.option == C_TRAILERS) {
-			struct trailer_info info;
+			struct strbuf s = STRBUF_INIT;
+
+			/* Format the trailer info according to the trailer_opts given */
+			format_trailers_from_commit(&s, subpos, &atom->u.contents.trailer_opts);
 
-			/* Search for trailer info */
-			trailer_info_get(&info, subpos);
-			v->s = xmemdupz(info.trailer_start,
-					info.trailer_end - info.trailer_start);
-			trailer_info_release(&info);
+			v->s = strbuf_detach(&s, NULL);
 		} else if (atom->u.contents.option == C_BARE)
 			v->s = xstrdup(subpos);
 	}
@@ -1325,9 +1338,8 @@ static void populate_value(struct ref_array_item *ref)
 	ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
 
 	if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
-		struct object_id unused1;
 		ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,
-					     unused1.hash, NULL);
+					     NULL, NULL);
 		if (!ref->symref)
 			ref->symref = "";
 	}
diff --git a/reflog-walk.c b/reflog-walk.c
index 74ebe5148..842b2f77d 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -61,11 +61,10 @@ static struct complete_reflogs *read_complete_reflog(const char *ref)
 	reflogs->ref = xstrdup(ref);
 	for_each_reflog_ent(ref, read_one_reflog, reflogs);
 	if (reflogs->nr == 0) {
-		struct object_id oid;
 		const char *name;
 		void *name_to_free;
 		name = name_to_free = resolve_refdup(ref, RESOLVE_REF_READING,
-						     oid.hash, NULL);
+						     NULL, NULL);
 		if (name) {
 			for_each_reflog_ent(name, read_one_reflog, reflogs);
 			free(name_to_free);
@@ -151,9 +150,8 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
 		reflogs = item->util;
 	else {
 		if (*branch == '\0') {
-			struct object_id oid;
 			free(branch);
-			branch = resolve_refdup("HEAD", 0, oid.hash, NULL);
+			branch = resolve_refdup("HEAD", 0, NULL, NULL);
 			if (!branch)
 				die ("No current branch");
 
diff --git a/refs.c b/refs.c
index 41aec6505..c590a992f 100644
--- a/refs.c
+++ b/refs.c
@@ -174,6 +174,24 @@ int refname_is_safe(const char *refname)
 	return 1;
 }
 
+/*
+ * Return true if refname, which has the specified oid and flags, can
+ * be resolved to an object in the database. If the referred-to object
+ * does not exist, emit a warning and return false.
+ */
+int ref_resolves_to_object(const char *refname,
+			   const struct object_id *oid,
+			   unsigned int flags)
+{
+	if (flags & REF_ISBROKEN)
+		return 0;
+	if (!has_sha1_file(oid->hash)) {
+		error("%s does not point to a valid object!", refname);
+		return 0;
+	}
+	return 1;
+}
+
 char *refs_resolve_refdup(struct ref_store *refs,
 			  const char *refname, int resolve_flags,
 			  unsigned char *sha1, int *flags)
@@ -221,8 +239,7 @@ int read_ref(const char *refname, unsigned char *sha1)
 
 int ref_exists(const char *refname)
 {
-	unsigned char sha1[20];
-	return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, sha1, NULL);
+	return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, NULL, NULL);
 }
 
 static int filter_refs(const char *refname, const struct object_id *oid,
@@ -268,12 +285,11 @@ static int warn_if_dangling_symref(const char *refname, const struct object_id *
 {
 	struct warn_if_dangling_data *d = cb_data;
 	const char *resolves_to;
-	struct object_id junk;
 
 	if (!(flags & REF_ISSYMREF))
 		return 0;
 
-	resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
+	resolves_to = resolve_ref_unsafe(refname, 0, NULL, NULL);
 	if (!resolves_to
 	    || (d->refname
 		? strcmp(resolves_to, d->refname)
@@ -318,12 +334,6 @@ int for_each_tag_ref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_tag_ref(get_main_ref_store(), fn, cb_data);
 }
 
-int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return refs_for_each_tag_ref(get_submodule_ref_store(submodule),
-				     fn, cb_data);
-}
-
 int refs_for_each_branch_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
 	return refs_for_each_ref_in(refs, "refs/heads/", fn, cb_data);
@@ -334,12 +344,6 @@ int for_each_branch_ref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_branch_ref(get_main_ref_store(), fn, cb_data);
 }
 
-int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return refs_for_each_branch_ref(get_submodule_ref_store(submodule),
-					fn, cb_data);
-}
-
 int refs_for_each_remote_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
 	return refs_for_each_ref_in(refs, "refs/remotes/", fn, cb_data);
@@ -350,12 +354,6 @@ int for_each_remote_ref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_remote_ref(get_main_ref_store(), fn, cb_data);
 }
 
-int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
-					fn, cb_data);
-}
-
 int head_ref_namespaced(each_ref_fn fn, void *cb_data)
 {
 	struct strbuf buf = STRBUF_INIT;
@@ -561,6 +559,21 @@ enum ref_type ref_type(const char *refname)
        return REF_TYPE_NORMAL;
 }
 
+long get_files_ref_lock_timeout_ms(void)
+{
+	static int configured = 0;
+
+	/* The default timeout is 100 ms: */
+	static int timeout_ms = 100;
+
+	if (!configured) {
+		git_config_get_int("core.filesreflocktimeout", &timeout_ms);
+		configured = 1;
+	}
+
+	return timeout_ms;
+}
+
 static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
 			   const unsigned char *old_sha1, struct strbuf *err)
 {
@@ -573,11 +586,13 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
 	strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1));
 
 	filename = git_path("%s", pseudoref);
-	fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
+	fd = hold_lock_file_for_update_timeout(&lock, filename,
+					       LOCK_DIE_ON_ERROR,
+					       get_files_ref_lock_timeout_ms());
 	if (fd < 0) {
 		strbuf_addf(err, "could not open '%s' for writing: %s",
 			    filename, strerror(errno));
-		return -1;
+		goto done;
 	}
 
 	if (old_sha1) {
@@ -592,7 +607,7 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
 		}
 	}
 
-	if (write_in_full(fd, buf.buf, buf.len) != buf.len) {
+	if (write_in_full(fd, buf.buf, buf.len) < 0) {
 		strbuf_addf(err, "could not write to '%s'", filename);
 		rollback_lock_file(&lock);
 		goto done;
@@ -616,8 +631,9 @@ static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1
 		int fd;
 		unsigned char actual_old_sha1[20];
 
-		fd = hold_lock_file_for_update(&lock, filename,
-					       LOCK_DIE_ON_ERROR);
+		fd = hold_lock_file_for_update_timeout(
+				&lock, filename, LOCK_DIE_ON_ERROR,
+				get_files_ref_lock_timeout_ms());
 		if (fd < 0)
 			die_errno(_("Could not open '%s' for writing"), filename);
 		if (read_ref(pseudoref, actual_old_sha1))
@@ -818,7 +834,7 @@ int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, in
 	for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
 
 	if (!cb.reccnt) {
-		if (flags & GET_SHA1_QUIETLY)
+		if (flags & GET_OID_QUIETLY)
 			exit(128);
 		else
 			die("Log for %s is empty.", refname);
@@ -1232,19 +1248,13 @@ int refs_rename_ref_available(struct ref_store *refs,
 	return ok;
 }
 
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
 	struct object_id oid;
 	int flag;
 
-	if (submodule) {
-		if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
-			return fn("HEAD", &oid, 0, cb_data);
-
-		return 0;
-	}
-
-	if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+	if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
+				oid.hash, &flag))
 		return fn("HEAD", &oid, flag, cb_data);
 
 	return 0;
@@ -1252,7 +1262,7 @@ int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
 
 int head_ref(each_ref_fn fn, void *cb_data)
 {
-	return head_ref_submodule(NULL, fn, cb_data);
+	return refs_head_ref(get_main_ref_store(), fn, cb_data);
 }
 
 struct ref_iterator *refs_ref_iterator_begin(
@@ -1275,6 +1285,10 @@ struct ref_iterator *refs_ref_iterator_begin(
 	if (trim)
 		iter = prefix_ref_iterator_begin(iter, "", trim);
 
+	/* Sanity check for subclasses: */
+	if (!iter->ordered)
+		BUG("reference iterator is not ordered");
+
 	return iter;
 }
 
@@ -1310,11 +1324,6 @@ int for_each_ref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_ref(get_main_ref_store(), fn, cb_data);
 }
 
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return refs_for_each_ref(get_submodule_ref_store(submodule), fn, cb_data);
-}
-
 int refs_for_each_ref_in(struct ref_store *refs, const char *prefix,
 			 each_ref_fn fn, void *cb_data)
 {
@@ -1336,23 +1345,15 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsig
 			       prefix, fn, 0, flag, cb_data);
 }
 
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
-			      each_ref_fn fn, void *cb_data)
-{
-	return refs_for_each_ref_in(get_submodule_ref_store(submodule),
-				    prefix, fn, cb_data);
-}
-
-int for_each_fullref_in_submodule(const char *submodule, const char *prefix,
-				  each_ref_fn fn, void *cb_data,
-				  unsigned int broken)
+int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
+			     each_ref_fn fn, void *cb_data,
+			     unsigned int broken)
 {
 	unsigned int flag = 0;
 
 	if (broken)
 		flag = DO_FOR_EACH_INCLUDE_BROKEN;
-	return do_for_each_ref(get_submodule_ref_store(submodule),
-			       prefix, fn, 0, flag, cb_data);
+	return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
 }
 
 int for_each_replace_ref(each_ref_fn fn, void *cb_data)
@@ -1360,7 +1361,7 @@ int for_each_replace_ref(each_ref_fn fn, void *cb_data)
 	return do_for_each_ref(get_main_ref_store(),
 			       git_replace_ref_base, fn,
 			       strlen(git_replace_ref_base),
-			       0, cb_data);
+			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
 }
 
 int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
@@ -1399,9 +1400,12 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 				    unsigned char *sha1, int *flags)
 {
 	static struct strbuf sb_refname = STRBUF_INIT;
+	struct object_id unused_oid;
 	int unused_flags;
 	int symref_count;
 
+	if (!sha1)
+		sha1 = unused_oid.hash;
 	if (!flags)
 		flags = &unused_flags;
 
@@ -1431,8 +1435,21 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 		if (refs_read_raw_ref(refs, refname,
 				      sha1, &sb_refname, &read_flags)) {
 			*flags |= read_flags;
-			if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
+
+			/* In reading mode, refs must eventually resolve */
+			if (resolve_flags & RESOLVE_REF_READING)
+				return NULL;
+
+			/*
+			 * Otherwise a missing ref is OK. But the files backend
+			 * may show errors besides ENOENT if there are
+			 * similarly-named refs.
+			 */
+			if (errno != ENOENT &&
+			    errno != EISDIR &&
+			    errno != ENOTDIR)
 				return NULL;
+
 			hashclr(sha1);
 			if (*flags & REF_BAD_NAME)
 				*flags |= REF_ISBROKEN;
@@ -1487,25 +1504,10 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 int resolve_gitlink_ref(const char *submodule, const char *refname,
 			unsigned char *sha1)
 {
-	size_t len = strlen(submodule);
 	struct ref_store *refs;
 	int flags;
 
-	while (len && submodule[len - 1] == '/')
-		len--;
-
-	if (!len)
-		return -1;
-
-	if (submodule[len]) {
-		/* We need to strip off one or more trailing slashes */
-		char *stripped = xmemdupz(submodule, len);
-
-		refs = get_submodule_ref_store(stripped);
-		free(stripped);
-	} else {
-		refs = get_submodule_ref_store(submodule);
-	}
+	refs = get_submodule_ref_store(submodule);
 
 	if (!refs)
 		return -1;
@@ -1620,31 +1622,32 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
 {
 	struct strbuf submodule_sb = STRBUF_INIT;
 	struct ref_store *refs;
-	int ret;
+	char *to_free = NULL;
+	size_t len;
 
-	if (!submodule || !*submodule) {
-		/*
-		 * FIXME: This case is ideally not allowed. But that
-		 * can't happen until we clean up all the callers.
-		 */
-		return get_main_ref_store();
-	}
+	if (!submodule)
+		return NULL;
+
+	len = strlen(submodule);
+	while (len && is_dir_sep(submodule[len - 1]))
+		len--;
+	if (!len)
+		return NULL;
+
+	if (submodule[len])
+		/* We need to strip off one or more trailing slashes */
+		submodule = to_free = xmemdupz(submodule, len);
 
 	refs = lookup_ref_store_map(&submodule_ref_stores, submodule);
 	if (refs)
-		return refs;
+		goto done;
 
 	strbuf_addstr(&submodule_sb, submodule);
-	ret = is_nonbare_repository_dir(&submodule_sb);
-	strbuf_release(&submodule_sb);
-	if (!ret)
-		return NULL;
+	if (!is_nonbare_repository_dir(&submodule_sb))
+		goto done;
 
-	ret = submodule_to_gitdir(&submodule_sb, submodule);
-	if (ret) {
-		strbuf_release(&submodule_sb);
-		return NULL;
-	}
+	if (submodule_to_gitdir(&submodule_sb, submodule))
+		goto done;
 
 	/* assume that add_submodule_odb() has been called */
 	refs = ref_store_init(submodule_sb.buf,
@@ -1652,7 +1655,10 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
 	register_ref_store_map(&submodule_ref_stores, "submodule",
 			       refs, submodule);
 
+done:
 	strbuf_release(&submodule_sb);
+	free(to_free);
+
 	return refs;
 }
 
@@ -1697,7 +1703,23 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags)
 int refs_peel_ref(struct ref_store *refs, const char *refname,
 		  unsigned char *sha1)
 {
-	return refs->be->peel_ref(refs, refname, sha1);
+	int flag;
+	unsigned char base[20];
+
+	if (current_ref_iter && current_ref_iter->refname == refname) {
+		struct object_id peeled;
+
+		if (ref_iterator_peel(current_ref_iter, &peeled))
+			return -1;
+		hashcpy(sha1, peeled.hash);
+		return 0;
+	}
+
+	if (refs_read_ref_full(refs, refname,
+			       RESOLVE_REF_READING, base, &flag))
+		return -1;
+
+	return peel_object(base, sha1);
 }
 
 int peel_ref(const char *refname, unsigned char *sha1)
@@ -2047,3 +2069,14 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
 {
 	return refs_rename_ref(get_main_ref_store(), oldref, newref, logmsg);
 }
+
+int refs_copy_existing_ref(struct ref_store *refs, const char *oldref,
+		    const char *newref, const char *logmsg)
+{
+	return refs->be->copy_ref(refs, oldref, newref, logmsg);
+}
+
+int copy_existing_ref(const char *oldref, const char *newref, const char *logmsg)
+{
+	return refs_copy_existing_ref(get_main_ref_store(), oldref, newref, logmsg);
+}
diff --git a/refs.h b/refs.h
index 4d75c207e..a02b628c8 100644
--- a/refs.h
+++ b/refs.h
@@ -10,10 +10,11 @@ struct worktree;
 /*
  * Resolve a reference, recursively following symbolic refererences.
  *
- * Store the referred-to object's name in sha1 and return the name of
- * the non-symbolic reference that ultimately pointed at it.  The
- * return value, if not NULL, is a pointer into either a static buffer
- * or the input ref.
+ * Return the name of the non-symbolic reference that ultimately pointed
+ * at the resolved object name.  The return value, if not NULL, is a
+ * pointer into either a static buffer or the input ref.
+ *
+ * If sha1 is non-NULL, store the referred-to object's name in it.
  *
  * If the reference cannot be resolved to an object, the behavior
  * depends on the RESOLVE_REF_READING flag:
@@ -275,6 +276,8 @@ typedef int each_ref_fn(const char *refname,
  * modifies the reference also returns a nonzero value to immediately
  * stop the iteration. Returned references are sorted.
  */
+int refs_head_ref(struct ref_store *refs,
+		  each_ref_fn fn, void *cb_data);
 int refs_for_each_ref(struct ref_store *refs,
 		      each_ref_fn fn, void *cb_data);
 int refs_for_each_ref_in(struct ref_store *refs, const char *prefix,
@@ -289,6 +292,9 @@ int refs_for_each_remote_ref(struct ref_store *refs,
 int head_ref(each_ref_fn fn, void *cb_data);
 int for_each_ref(each_ref_fn fn, void *cb_data);
 int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
+int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
+			     each_ref_fn fn, void *cb_data,
+			     unsigned int broken);
 int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
 			unsigned int broken);
 int for_each_tag_ref(each_ref_fn fn, void *cb_data);
@@ -299,21 +305,6 @@ int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
 int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
 			 const char *prefix, void *cb_data);
 
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-int for_each_ref_submodule(const char *submodule,
-			   each_ref_fn fn, void *cb_data);
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
-			      each_ref_fn fn, void *cb_data);
-int for_each_fullref_in_submodule(const char *submodule, const char *prefix,
-				  each_ref_fn fn, void *cb_data,
-				  unsigned int broken);
-int for_each_tag_ref_submodule(const char *submodule,
-			       each_ref_fn fn, void *cb_data);
-int for_each_branch_ref_submodule(const char *submodule,
-				  each_ref_fn fn, void *cb_data);
-int for_each_remote_ref_submodule(const char *submodule,
-				  each_ref_fn fn, void *cb_data);
-
 int head_ref_namespaced(each_ref_fn fn, void *cb_data);
 int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
 
@@ -451,7 +442,14 @@ char *shorten_unambiguous_ref(const char *refname, int strict);
 /** rename ref, return 0 on success **/
 int refs_rename_ref(struct ref_store *refs, const char *oldref,
 		    const char *newref, const char *logmsg);
-int rename_ref(const char *oldref, const char *newref, const char *logmsg);
+int rename_ref(const char *oldref, const char *newref,
+			const char *logmsg);
+
+/** copy ref, return 0 on success **/
+int refs_copy_existing_ref(struct ref_store *refs, const char *oldref,
+		    const char *newref, const char *logmsg);
+int copy_existing_ref(const char *oldref, const char *newref,
+			const char *logmsg);
 
 int refs_create_symref(struct ref_store *refs, const char *refname,
 		       const char *target, const char *logmsg);
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0404f2c23..8cc1e07fd 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3,6 +3,7 @@
 #include "../refs.h"
 #include "refs-internal.h"
 #include "ref-cache.h"
+#include "packed-backend.h"
 #include "../iterator.h"
 #include "../dir-iterator.h"
 #include "../lockfile.h"
@@ -11,44 +12,11 @@
 
 struct ref_lock {
 	char *ref_name;
-	struct lock_file *lk;
+	struct lock_file lk;
 	struct object_id old_oid;
 };
 
 /*
- * Return true if refname, which has the specified oid and flags, can
- * be resolved to an object in the database. If the referred-to object
- * does not exist, emit a warning and return false.
- */
-static int ref_resolves_to_object(const char *refname,
-				  const struct object_id *oid,
-				  unsigned int flags)
-{
-	if (flags & REF_ISBROKEN)
-		return 0;
-	if (!has_sha1_file(oid->hash)) {
-		error("%s does not point to a valid object!", refname);
-		return 0;
-	}
-	return 1;
-}
-
-struct packed_ref_cache {
-	struct ref_cache *cache;
-
-	/*
-	 * Count of references to the data structure in this instance,
-	 * including the pointer from files_ref_store::packed if any.
-	 * The data will not be freed as long as the reference count
-	 * is nonzero.
-	 */
-	unsigned int referrers;
-
-	/* The metadata from when this packed-refs cache was read */
-	struct stat_validity validity;
-};
-
-/*
  * Future: need to be in "struct repository"
  * when doing a full libification.
  */
@@ -58,54 +26,12 @@ struct files_ref_store {
 
 	char *gitdir;
 	char *gitcommondir;
-	char *packed_refs_path;
 
 	struct ref_cache *loose;
-	struct packed_ref_cache *packed;
 
-	/*
-	 * Lock used for the "packed-refs" file. Note that this (and
-	 * thus the enclosing `files_ref_store`) must not be freed.
-	 */
-	struct lock_file packed_refs_lock;
+	struct ref_store *packed_ref_store;
 };
 
-/*
- * Increment the reference count of *packed_refs.
- */
-static void acquire_packed_ref_cache(struct packed_ref_cache *packed_refs)
-{
-	packed_refs->referrers++;
-}
-
-/*
- * Decrease the reference count of *packed_refs.  If it goes to zero,
- * free *packed_refs and return true; otherwise return false.
- */
-static int release_packed_ref_cache(struct packed_ref_cache *packed_refs)
-{
-	if (!--packed_refs->referrers) {
-		free_ref_cache(packed_refs->cache);
-		stat_validity_clear(&packed_refs->validity);
-		free(packed_refs);
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-static void clear_packed_ref_cache(struct files_ref_store *refs)
-{
-	if (refs->packed) {
-		struct packed_ref_cache *packed_refs = refs->packed;
-
-		if (is_lock_file_locked(&refs->packed_refs_lock))
-			die("BUG: packed-ref cache cleared while locked");
-		refs->packed = NULL;
-		release_packed_ref_cache(packed_refs);
-	}
-}
-
 static void clear_loose_ref_cache(struct files_ref_store *refs)
 {
 	if (refs->loose) {
@@ -132,7 +58,8 @@ static struct ref_store *files_ref_store_create(const char *gitdir,
 	get_common_dir_noenv(&sb, gitdir);
 	refs->gitcommondir = strbuf_detach(&sb, NULL);
 	strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
-	refs->packed_refs_path = strbuf_detach(&sb, NULL);
+	refs->packed_ref_store = packed_ref_store_create(sb.buf, flags);
+	strbuf_release(&sb);
 
 	return ref_store;
 }
@@ -175,169 +102,10 @@ static struct files_ref_store *files_downcast(struct ref_store *ref_store,
 	return refs;
 }
 
-/* The length of a peeled reference line in packed-refs, including EOL: */
-#define PEELED_LINE_LENGTH 42
-
-/*
- * The packed-refs header line that we write out.  Perhaps other
- * traits will be added later.  The trailing space is required.
- */
-static const char PACKED_REFS_HEADER[] =
-	"# pack-refs with: peeled fully-peeled \n";
-
-/*
- * Parse one line from a packed-refs file.  Write the SHA1 to sha1.
- * Return a pointer to the refname within the line (null-terminated),
- * or NULL if there was a problem.
- */
-static const char *parse_ref_line(struct strbuf *line, struct object_id *oid)
-{
-	const char *ref;
-
-	if (parse_oid_hex(line->buf, oid, &ref) < 0)
-		return NULL;
-	if (!isspace(*ref++))
-		return NULL;
-
-	if (isspace(*ref))
-		return NULL;
-
-	if (line->buf[line->len - 1] != '\n')
-		return NULL;
-	line->buf[--line->len] = 0;
-
-	return ref;
-}
-
-/*
- * Read from `packed_refs_file` into a newly-allocated
- * `packed_ref_cache` and return it. The return value will already
- * have its reference count incremented.
- *
- * A comment line of the form "# pack-refs with: " may contain zero or
- * more traits. We interpret the traits as follows:
- *
- *   No traits:
- *
- *      Probably no references are peeled. But if the file contains a
- *      peeled value for a reference, we will use it.
- *
- *   peeled:
- *
- *      References under "refs/tags/", if they *can* be peeled, *are*
- *      peeled in this file. References outside of "refs/tags/" are
- *      probably not peeled even if they could have been, but if we find
- *      a peeled value for such a reference we will use it.
- *
- *   fully-peeled:
- *
- *      All references in the file that can be peeled are peeled.
- *      Inversely (and this is more important), any references in the
- *      file for which no peeled value is recorded is not peelable. This
- *      trait should typically be written alongside "peeled" for
- *      compatibility with older clients, but we do not require it
- *      (i.e., "peeled" is a no-op if "fully-peeled" is set).
- */
-static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file)
-{
-	FILE *f;
-	struct packed_ref_cache *packed_refs = xcalloc(1, sizeof(*packed_refs));
-	struct ref_entry *last = NULL;
-	struct strbuf line = STRBUF_INIT;
-	enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE;
-	struct ref_dir *dir;
-
-	acquire_packed_ref_cache(packed_refs);
-	packed_refs->cache = create_ref_cache(NULL, NULL);
-	packed_refs->cache->root->flag &= ~REF_INCOMPLETE;
-
-	f = fopen(packed_refs_file, "r");
-	if (!f) {
-		if (errno == ENOENT) {
-			/*
-			 * This is OK; it just means that no
-			 * "packed-refs" file has been written yet,
-			 * which is equivalent to it being empty.
-			 */
-			return packed_refs;
-		} else {
-			die_errno("couldn't read %s", packed_refs_file);
-		}
-	}
-
-	stat_validity_update(&packed_refs->validity, fileno(f));
-
-	dir = get_ref_dir(packed_refs->cache->root);
-	while (strbuf_getwholeline(&line, f, '\n') != EOF) {
-		struct object_id oid;
-		const char *refname;
-		const char *traits;
-
-		if (skip_prefix(line.buf, "# pack-refs with:", &traits)) {
-			if (strstr(traits, " fully-peeled "))
-				peeled = PEELED_FULLY;
-			else if (strstr(traits, " peeled "))
-				peeled = PEELED_TAGS;
-			/* perhaps other traits later as well */
-			continue;
-		}
-
-		refname = parse_ref_line(&line, &oid);
-		if (refname) {
-			int flag = REF_ISPACKED;
-
-			if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-				if (!refname_is_safe(refname))
-					die("packed refname is dangerous: %s", refname);
-				oidclr(&oid);
-				flag |= REF_BAD_NAME | REF_ISBROKEN;
-			}
-			last = create_ref_entry(refname, &oid, flag);
-			if (peeled == PEELED_FULLY ||
-			    (peeled == PEELED_TAGS && starts_with(refname, "refs/tags/")))
-				last->flag |= REF_KNOWS_PEELED;
-			add_ref_entry(dir, last);
-			continue;
-		}
-		if (last &&
-		    line.buf[0] == '^' &&
-		    line.len == PEELED_LINE_LENGTH &&
-		    line.buf[PEELED_LINE_LENGTH - 1] == '\n' &&
-		    !get_oid_hex(line.buf + 1, &oid)) {
-			oidcpy(&last->u.value.peeled, &oid);
-			/*
-			 * Regardless of what the file header said,
-			 * we definitely know the value of *this*
-			 * reference:
-			 */
-			last->flag |= REF_KNOWS_PEELED;
-		}
-	}
-
-	fclose(f);
-	strbuf_release(&line);
-
-	return packed_refs;
-}
-
-static const char *files_packed_refs_path(struct files_ref_store *refs)
-{
-	return refs->packed_refs_path;
-}
-
 static void files_reflog_path(struct files_ref_store *refs,
 			      struct strbuf *sb,
 			      const char *refname)
 {
-	if (!refname) {
-		/*
-		 * FIXME: of course this is wrong in multi worktree
-		 * setting. To be fixed real soon.
-		 */
-		strbuf_addf(sb, "%s/logs", refs->gitcommondir);
-		return;
-	}
-
 	switch (ref_type(refname)) {
 	case REF_TYPE_PER_WORKTREE:
 	case REF_TYPE_PSEUDOREF:
@@ -371,70 +139,6 @@ static void files_ref_path(struct files_ref_store *refs,
 }
 
 /*
- * Check that the packed refs cache (if any) still reflects the
- * contents of the file. If not, clear the cache.
- */
-static void validate_packed_ref_cache(struct files_ref_store *refs)
-{
-	if (refs->packed &&
-	    !stat_validity_check(&refs->packed->validity,
-				 files_packed_refs_path(refs)))
-		clear_packed_ref_cache(refs);
-}
-
-/*
- * Get the packed_ref_cache for the specified files_ref_store,
- * creating and populating it if it hasn't been read before or if the
- * file has been changed (according to its `validity` field) since it
- * was last read. On the other hand, if we hold the lock, then assume
- * that the file hasn't been changed out from under us, so skip the
- * extra `stat()` call in `stat_validity_check()`.
- */
-static struct packed_ref_cache *get_packed_ref_cache(struct files_ref_store *refs)
-{
-	const char *packed_refs_file = files_packed_refs_path(refs);
-
-	if (!is_lock_file_locked(&refs->packed_refs_lock))
-		validate_packed_ref_cache(refs);
-
-	if (!refs->packed)
-		refs->packed = read_packed_refs(packed_refs_file);
-
-	return refs->packed;
-}
-
-static struct ref_dir *get_packed_ref_dir(struct packed_ref_cache *packed_ref_cache)
-{
-	return get_ref_dir(packed_ref_cache->cache->root);
-}
-
-static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
-{
-	return get_packed_ref_dir(get_packed_ref_cache(refs));
-}
-
-/*
- * Add a reference to the in-memory packed reference cache.  This may
- * only be called while the packed-refs file is locked (see
- * lock_packed_refs()).  To actually write the packed-refs file, call
- * commit_packed_refs().
- */
-static void add_packed_ref(struct files_ref_store *refs,
-			   const char *refname, const struct object_id *oid)
-{
-	struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
-
-	if (!is_lock_file_locked(&refs->packed_refs_lock))
-		die("BUG: packed refs not locked");
-
-	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
-		die("Reference has invalid format: '%s'", refname);
-
-	add_ref_entry(get_packed_ref_dir(packed_ref_cache),
-		      create_ref_entry(refname, oid, REF_ISPACKED));
-}
-
-/*
  * Read the loose references from the namespace dirname into dir
  * (without recursing).  dirname must end with '/'.  dir must be the
  * directory entry corresponding to dirname.
@@ -556,39 +260,6 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
 	return refs->loose;
 }
 
-/*
- * Return the ref_entry for the given refname from the packed
- * references.  If it does not exist, return NULL.
- */
-static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
-					const char *refname)
-{
-	return find_ref_entry(get_packed_refs(refs), refname);
-}
-
-/*
- * A loose ref file doesn't exist; check for a packed ref.
- */
-static int resolve_packed_ref(struct files_ref_store *refs,
-			      const char *refname,
-			      unsigned char *sha1, unsigned int *flags)
-{
-	struct ref_entry *entry;
-
-	/*
-	 * The loose reference file does not exist; check for a packed
-	 * reference.
-	 */
-	entry = get_packed_ref(refs, refname);
-	if (entry) {
-		hashcpy(sha1, entry->u.value.oid.hash);
-		*flags |= REF_ISPACKED;
-		return 0;
-	}
-	/* refname is not a packed reference. */
-	return -1;
-}
-
 static int files_read_raw_ref(struct ref_store *ref_store,
 			      const char *refname, unsigned char *sha1,
 			      struct strbuf *referent, unsigned int *type)
@@ -632,7 +303,8 @@ stat_ref:
 	if (lstat(path, &st) < 0) {
 		if (errno != ENOENT)
 			goto out;
-		if (resolve_packed_ref(refs, refname, sha1, type)) {
+		if (refs_read_raw_ref(refs->packed_ref_store, refname,
+				      sha1, referent, type)) {
 			errno = ENOENT;
 			goto out;
 		}
@@ -671,7 +343,8 @@ stat_ref:
 		 * ref is supposed to be, there could still be a
 		 * packed ref:
 		 */
-		if (resolve_packed_ref(refs, refname, sha1, type)) {
+		if (refs_read_raw_ref(refs->packed_ref_store, refname,
+				      sha1, referent, type)) {
 			errno = EISDIR;
 			goto out;
 		}
@@ -736,9 +409,7 @@ out:
 
 static void unlock_ref(struct ref_lock *lock)
 {
-	/* Do not free lock->lk -- atexit() still looks at them */
-	if (lock->lk)
-		rollback_lock_file(lock->lk);
+	rollback_lock_file(&lock->lk);
 	free(lock->ref_name);
 	free(lock);
 }
@@ -852,10 +523,9 @@ retry:
 		goto error_return;
 	}
 
-	if (!lock->lk)
-		lock->lk = xcalloc(1, sizeof(struct lock_file));
-
-	if (hold_lock_file_for_update(lock->lk, ref_file.buf, LOCK_NO_DEREF) < 0) {
+	if (hold_lock_file_for_update_timeout(
+			    &lock->lk, ref_file.buf, LOCK_NO_DEREF,
+			    get_files_ref_lock_timeout_ms()) < 0) {
 		if (errno == ENOENT && --attempts_remaining > 0) {
 			/*
 			 * Maybe somebody just deleted one of the
@@ -950,11 +620,11 @@ retry:
 
 		/*
 		 * If the ref did not exist and we are creating it,
-		 * make sure there is no existing ref that conflicts
-		 * with refname:
+		 * make sure there is no existing packed ref that
+		 * conflicts with refname:
 		 */
 		if (refs_verify_refname_available(
-				    &refs->base, refname,
+				    refs->packed_ref_store, refname,
 				    extras, skip, err))
 			goto error_return;
 	}
@@ -971,53 +641,9 @@ out:
 	return ret;
 }
 
-static int files_peel_ref(struct ref_store *ref_store,
-			  const char *refname, unsigned char *sha1)
-{
-	struct files_ref_store *refs =
-		files_downcast(ref_store, REF_STORE_READ | REF_STORE_ODB,
-			       "peel_ref");
-	int flag;
-	unsigned char base[20];
-
-	if (current_ref_iter && current_ref_iter->refname == refname) {
-		struct object_id peeled;
-
-		if (ref_iterator_peel(current_ref_iter, &peeled))
-			return -1;
-		hashcpy(sha1, peeled.hash);
-		return 0;
-	}
-
-	if (refs_read_ref_full(ref_store, refname,
-			       RESOLVE_REF_READING, base, &flag))
-		return -1;
-
-	/*
-	 * If the reference is packed, read its ref_entry from the
-	 * cache in the hope that we already know its peeled value.
-	 * We only try this optimization on packed references because
-	 * (a) forcing the filling of the loose reference cache could
-	 * be expensive and (b) loose references anyway usually do not
-	 * have REF_KNOWS_PEELED.
-	 */
-	if (flag & REF_ISPACKED) {
-		struct ref_entry *r = get_packed_ref(refs, refname);
-		if (r) {
-			if (peel_entry(r, 0))
-				return -1;
-			hashcpy(sha1, r->u.value.peeled.hash);
-			return 0;
-		}
-	}
-
-	return peel_object(base, sha1);
-}
-
 struct files_ref_iterator {
 	struct ref_iterator base;
 
-	struct packed_ref_cache *packed_ref_cache;
 	struct ref_iterator *iter0;
 	unsigned int flags;
 };
@@ -1070,7 +696,6 @@ static int files_ref_iterator_abort(struct ref_iterator *ref_iterator)
 	if (iter->iter0)
 		ok = ref_iterator_abort(iter->iter0);
 
-	release_packed_ref_cache(iter->packed_ref_cache);
 	base_ref_iterator_free(ref_iterator);
 	return ok;
 }
@@ -1086,7 +711,7 @@ static struct ref_iterator *files_ref_iterator_begin(
 		const char *prefix, unsigned int flags)
 {
 	struct files_ref_store *refs;
-	struct ref_iterator *loose_iter, *packed_iter;
+	struct ref_iterator *loose_iter, *packed_iter, *overlay_iter;
 	struct files_ref_iterator *iter;
 	struct ref_iterator *ref_iterator;
 	unsigned int required_flags = REF_STORE_READ;
@@ -1096,10 +721,6 @@ static struct ref_iterator *files_ref_iterator_begin(
 
 	refs = files_downcast(ref_store, required_flags, "ref_iterator_begin");
 
-	iter = xcalloc(1, sizeof(*iter));
-	ref_iterator = &iter->base;
-	base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable);
-
 	/*
 	 * We must make sure that all loose refs are read before
 	 * accessing the packed-refs file; this avoids a race
@@ -1112,20 +733,36 @@ static struct ref_iterator *files_ref_iterator_begin(
 	 * (If they've already been read, that's OK; we only need to
 	 * guarantee that they're read before the packed refs, not
 	 * *how much* before.) After that, we call
-	 * get_packed_ref_cache(), which internally checks whether the
-	 * packed-ref cache is up to date with what is on disk, and
-	 * re-reads it if not.
+	 * packed_ref_iterator_begin(), which internally checks
+	 * whether the packed-ref cache is up to date with what is on
+	 * disk, and re-reads it if not.
 	 */
 
 	loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
 					      prefix, 1);
 
-	iter->packed_ref_cache = get_packed_ref_cache(refs);
-	acquire_packed_ref_cache(iter->packed_ref_cache);
-	packed_iter = cache_ref_iterator_begin(iter->packed_ref_cache->cache,
-					       prefix, 0);
+	/*
+	 * The packed-refs file might contain broken references, for
+	 * example an old version of a reference that points at an
+	 * object that has since been garbage-collected. This is OK as
+	 * long as there is a corresponding loose reference that
+	 * overrides it, and we don't want to emit an error message in
+	 * this case. So ask the packed_ref_store for all of its
+	 * references, and (if needed) do our own check for broken
+	 * ones in files_ref_iterator_advance(), after we have merged
+	 * the packed and loose references.
+	 */
+	packed_iter = refs_ref_iterator_begin(
+			refs->packed_ref_store, prefix, 0,
+			DO_FOR_EACH_INCLUDE_BROKEN);
 
-	iter->iter0 = overlay_ref_iterator_begin(loose_iter, packed_iter);
+	overlay_iter = overlay_ref_iterator_begin(loose_iter, packed_iter);
+
+	iter = xcalloc(1, sizeof(*iter));
+	ref_iterator = &iter->base;
+	base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
+			       overlay_iter->ordered);
+	iter->iter0 = overlay_iter;
 	iter->flags = flags;
 
 	return ref_iterator;
@@ -1181,7 +818,9 @@ static int create_reflock(const char *path, void *cb)
 {
 	struct lock_file *lk = cb;
 
-	return hold_lock_file_for_update(lk, path, LOCK_NO_DEREF) < 0 ? -1 : 0;
+	return hold_lock_file_for_update_timeout(
+			lk, path, LOCK_NO_DEREF,
+			get_files_ref_lock_timeout_ms()) < 0 ? -1 : 0;
 }
 
 /*
@@ -1255,17 +894,15 @@ static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
 	 * our refname.
 	 */
 	if (is_null_oid(&lock->old_oid) &&
-	    refs_verify_refname_available(&refs->base, refname,
+	    refs_verify_refname_available(refs->packed_ref_store, refname,
 					  extras, skip, err)) {
 		last_errno = ENOTDIR;
 		goto error_return;
 	}
 
-	lock->lk = xcalloc(1, sizeof(struct lock_file));
-
 	lock->ref_name = xstrdup(refname);
 
-	if (raceproof_create_file(ref_file.buf, create_reflock, lock->lk)) {
+	if (raceproof_create_file(ref_file.buf, create_reflock, &lock->lk)) {
 		last_errno = errno;
 		unable_to_lock_message(ref_file.buf, errno, err);
 		goto error_return;
@@ -1287,124 +924,6 @@ static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
 	return lock;
 }
 
-/*
- * Write an entry to the packed-refs file for the specified refname.
- * If peeled is non-NULL, write it as the entry's peeled value.
- */
-static void write_packed_entry(FILE *fh, const char *refname,
-			       const unsigned char *sha1,
-			       const unsigned char *peeled)
-{
-	fprintf_or_die(fh, "%s %s\n", sha1_to_hex(sha1), refname);
-	if (peeled)
-		fprintf_or_die(fh, "^%s\n", sha1_to_hex(peeled));
-}
-
-/*
- * Lock the packed-refs file for writing. Flags is passed to
- * hold_lock_file_for_update(). Return 0 on success. On errors, set
- * errno appropriately and return a nonzero value.
- */
-static int lock_packed_refs(struct files_ref_store *refs, int flags)
-{
-	static int timeout_configured = 0;
-	static int timeout_value = 1000;
-	struct packed_ref_cache *packed_ref_cache;
-
-	files_assert_main_repository(refs, "lock_packed_refs");
-
-	if (!timeout_configured) {
-		git_config_get_int("core.packedrefstimeout", &timeout_value);
-		timeout_configured = 1;
-	}
-
-	if (hold_lock_file_for_update_timeout(
-			    &refs->packed_refs_lock, files_packed_refs_path(refs),
-			    flags, timeout_value) < 0)
-		return -1;
-
-	/*
-	 * Now that we hold the `packed-refs` lock, make sure that our
-	 * cache matches the current version of the file. Normally
-	 * `get_packed_ref_cache()` does that for us, but that
-	 * function assumes that when the file is locked, any existing
-	 * cache is still valid. We've just locked the file, but it
-	 * might have changed the moment *before* we locked it.
-	 */
-	validate_packed_ref_cache(refs);
-
-	packed_ref_cache = get_packed_ref_cache(refs);
-	/* Increment the reference count to prevent it from being freed: */
-	acquire_packed_ref_cache(packed_ref_cache);
-	return 0;
-}
-
-/*
- * Write the current version of the packed refs cache from memory to
- * disk. The packed-refs file must already be locked for writing (see
- * lock_packed_refs()). Return zero on success. On errors, set errno
- * and return a nonzero value
- */
-static int commit_packed_refs(struct files_ref_store *refs)
-{
-	struct packed_ref_cache *packed_ref_cache =
-		get_packed_ref_cache(refs);
-	int ok, error = 0;
-	int save_errno = 0;
-	FILE *out;
-	struct ref_iterator *iter;
-
-	files_assert_main_repository(refs, "commit_packed_refs");
-
-	if (!is_lock_file_locked(&refs->packed_refs_lock))
-		die("BUG: packed-refs not locked");
-
-	out = fdopen_lock_file(&refs->packed_refs_lock, "w");
-	if (!out)
-		die_errno("unable to fdopen packed-refs descriptor");
-
-	fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
-
-	iter = cache_ref_iterator_begin(packed_ref_cache->cache, NULL, 0);
-	while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
-		struct object_id peeled;
-		int peel_error = ref_iterator_peel(iter, &peeled);
-
-		write_packed_entry(out, iter->refname, iter->oid->hash,
-				   peel_error ? NULL : peeled.hash);
-	}
-
-	if (ok != ITER_DONE)
-		die("error while iterating over references");
-
-	if (commit_lock_file(&refs->packed_refs_lock)) {
-		save_errno = errno;
-		error = -1;
-	}
-	release_packed_ref_cache(packed_ref_cache);
-	errno = save_errno;
-	return error;
-}
-
-/*
- * Rollback the lockfile for the packed-refs file, and discard the
- * in-memory packed reference cache.  (The packed-refs file will be
- * read anew if it is needed again after this function is called.)
- */
-static void rollback_packed_refs(struct files_ref_store *refs)
-{
-	struct packed_ref_cache *packed_ref_cache =
-		get_packed_ref_cache(refs);
-
-	files_assert_main_repository(refs, "rollback_packed_refs");
-
-	if (!is_lock_file_locked(&refs->packed_refs_lock))
-		die("BUG: packed-refs not locked");
-	rollback_lock_file(&refs->packed_refs_lock);
-	release_packed_ref_cache(packed_ref_cache);
-	clear_packed_ref_cache(refs);
-}
-
 struct ref_to_prune {
 	struct ref_to_prune *next;
 	unsigned char sha1[20];
@@ -1487,11 +1006,17 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r)
 	strbuf_release(&err);
 }
 
-static void prune_refs(struct files_ref_store *refs, struct ref_to_prune *r)
+/*
+ * Prune the loose versions of the references in the linked list
+ * `*refs_to_prune`, freeing the entries in the list as we go.
+ */
+static void prune_refs(struct files_ref_store *refs, struct ref_to_prune **refs_to_prune)
 {
-	while (r) {
+	while (*refs_to_prune) {
+		struct ref_to_prune *r = *refs_to_prune;
+		*refs_to_prune = r->next;
 		prune_ref(refs, r);
-		r = r->next;
+		free(r);
 	}
 }
 
@@ -1527,12 +1052,16 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
 		files_downcast(ref_store, REF_STORE_WRITE | REF_STORE_ODB,
 			       "pack_refs");
 	struct ref_iterator *iter;
-	struct ref_dir *packed_refs;
 	int ok;
 	struct ref_to_prune *refs_to_prune = NULL;
+	struct strbuf err = STRBUF_INIT;
+	struct ref_transaction *transaction;
+
+	transaction = ref_store_transaction_begin(refs->packed_ref_store, &err);
+	if (!transaction)
+		return -1;
 
-	lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
-	packed_refs = get_packed_refs(refs);
+	packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
 
 	iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
 	while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
@@ -1541,29 +1070,19 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
 		 * in the packed ref cache. If the reference should be
 		 * pruned, also add it to refs_to_prune.
 		 */
-		struct ref_entry *packed_entry;
-
 		if (!should_pack_ref(iter->refname, iter->oid, iter->flags,
 				     flags))
 			continue;
 
 		/*
-		 * Create an entry in the packed-refs cache equivalent
-		 * to the one from the loose ref cache, except that
-		 * we don't copy the peeled status, because we want it
-		 * to be re-peeled.
+		 * Add a reference creation for this reference to the
+		 * packed-refs transaction:
 		 */
-		packed_entry = find_ref_entry(packed_refs, iter->refname);
-		if (packed_entry) {
-			/* Overwrite existing packed entry with info from loose entry */
-			packed_entry->flag = REF_ISPACKED;
-			oidcpy(&packed_entry->u.value.oid, iter->oid);
-		} else {
-			packed_entry = create_ref_entry(iter->refname, iter->oid,
-							REF_ISPACKED);
-			add_ref_entry(packed_refs, packed_entry);
-		}
-		oidclr(&packed_entry->u.value.peeled);
+		if (ref_transaction_update(transaction, iter->refname,
+					   iter->oid->hash, NULL,
+					   REF_NODEREF, NULL, &err))
+			die("failure preparing to create packed reference %s: %s",
+			    iter->refname, err.buf);
 
 		/* Schedule the loose reference for pruning if requested. */
 		if ((flags & PACK_REFS_PRUNE)) {
@@ -1577,67 +1096,16 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
 	if (ok != ITER_DONE)
 		die("error while iterating over references");
 
-	if (commit_packed_refs(refs))
-		die_errno("unable to overwrite old ref-pack file");
+	if (ref_transaction_commit(transaction, &err))
+		die("unable to write new packed-refs: %s", err.buf);
 
-	prune_refs(refs, refs_to_prune);
-	return 0;
-}
-
-/*
- * Rewrite the packed-refs file, omitting any refs listed in
- * 'refnames'. On error, leave packed-refs unchanged, write an error
- * message to 'err', and return a nonzero value.
- *
- * The refs in 'refnames' needn't be sorted. `err` must not be NULL.
- */
-static int repack_without_refs(struct files_ref_store *refs,
-			       struct string_list *refnames, struct strbuf *err)
-{
-	struct ref_dir *packed;
-	struct string_list_item *refname;
-	int ret, needs_repacking = 0, removed = 0;
-
-	files_assert_main_repository(refs, "repack_without_refs");
-	assert(err);
-
-	/* Look for a packed ref */
-	for_each_string_list_item(refname, refnames) {
-		if (get_packed_ref(refs, refname->string)) {
-			needs_repacking = 1;
-			break;
-		}
-	}
-
-	/* Avoid locking if we have nothing to do */
-	if (!needs_repacking)
-		return 0; /* no refname exists in packed refs */
-
-	if (lock_packed_refs(refs, 0)) {
-		unable_to_lock_message(files_packed_refs_path(refs), errno, err);
-		return -1;
-	}
-	packed = get_packed_refs(refs);
+	ref_transaction_free(transaction);
 
-	/* Remove refnames from the cache */
-	for_each_string_list_item(refname, refnames)
-		if (remove_entry_from_dir(packed, refname->string) != -1)
-			removed = 1;
-	if (!removed) {
-		/*
-		 * All packed entries disappeared while we were
-		 * acquiring the lock.
-		 */
-		rollback_packed_refs(refs);
-		return 0;
-	}
+	packed_refs_unlock(refs->packed_ref_store);
 
-	/* Write what remains */
-	ret = commit_packed_refs(refs);
-	if (ret)
-		strbuf_addf(err, "unable to overwrite old ref-pack file: %s",
-			    strerror(errno));
-	return ret;
+	prune_refs(refs, &refs_to_prune);
+	strbuf_release(&err);
+	return 0;
 }
 
 static int files_delete_refs(struct ref_store *ref_store, const char *msg,
@@ -1651,24 +1119,16 @@ static int files_delete_refs(struct ref_store *ref_store, const char *msg,
 	if (!refnames->nr)
 		return 0;
 
-	result = repack_without_refs(refs, refnames, &err);
-	if (result) {
-		/*
-		 * If we failed to rewrite the packed-refs file, then
-		 * it is unsafe to try to remove loose refs, because
-		 * doing so might expose an obsolete packed value for
-		 * a reference that might even point at an object that
-		 * has been garbage collected.
-		 */
-		if (refnames->nr == 1)
-			error(_("could not delete reference %s: %s"),
-			      refnames->items[0].string, err.buf);
-		else
-			error(_("could not delete references: %s"), err.buf);
+	if (packed_refs_lock(refs->packed_ref_store, 0, &err))
+		goto error;
 
-		goto out;
+	if (refs_delete_refs(refs->packed_ref_store, msg, refnames, flags)) {
+		packed_refs_unlock(refs->packed_ref_store);
+		goto error;
 	}
 
+	packed_refs_unlock(refs->packed_ref_store);
+
 	for (i = 0; i < refnames->nr; i++) {
 		const char *refname = refnames->items[i].string;
 
@@ -1676,9 +1136,24 @@ static int files_delete_refs(struct ref_store *ref_store, const char *msg,
 			result |= error(_("could not remove reference %s"), refname);
 	}
 
-out:
 	strbuf_release(&err);
 	return result;
+
+error:
+	/*
+	 * If we failed to rewrite the packed-refs file, then it is
+	 * unsafe to try to remove loose refs, because doing so might
+	 * expose an obsolete packed value for a reference that might
+	 * even point at an object that has been garbage collected.
+	 */
+	if (refnames->nr == 1)
+		error(_("could not delete reference %s: %s"),
+		      refnames->items[0].string, err.buf);
+	else
+		error(_("could not delete references: %s"), err.buf);
+
+	strbuf_release(&err);
+	return -1;
 }
 
 /*
@@ -1748,9 +1223,9 @@ static int commit_ref_update(struct files_ref_store *refs,
 			     const struct object_id *oid, const char *logmsg,
 			     struct strbuf *err);
 
-static int files_rename_ref(struct ref_store *ref_store,
+static int files_copy_or_rename_ref(struct ref_store *ref_store,
 			    const char *oldrefname, const char *newrefname,
-			    const char *logmsg)
+			    const char *logmsg, int copy)
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "rename_ref");
@@ -1782,8 +1257,12 @@ static int files_rename_ref(struct ref_store *ref_store,
 	}
 
 	if (flag & REF_ISSYMREF) {
-		ret = error("refname %s is a symbolic ref, renaming it is not supported",
-			    oldrefname);
+		if (copy)
+			ret = error("refname %s is a symbolic ref, copying it is not supported",
+				    oldrefname);
+		else
+			ret = error("refname %s is a symbolic ref, renaming it is not supported",
+				    oldrefname);
 		goto out;
 	}
 	if (!refs_rename_ref_available(&refs->base, oldrefname, newrefname)) {
@@ -1791,13 +1270,19 @@ static int files_rename_ref(struct ref_store *ref_store,
 		goto out;
 	}
 
-	if (log && rename(sb_oldref.buf, tmp_renamed_log.buf)) {
+	if (!copy && log && rename(sb_oldref.buf, tmp_renamed_log.buf)) {
 		ret = error("unable to move logfile logs/%s to logs/"TMP_RENAMED_LOG": %s",
 			    oldrefname, strerror(errno));
 		goto out;
 	}
 
-	if (refs_delete_ref(&refs->base, logmsg, oldrefname,
+	if (copy && log && copy_file(tmp_renamed_log.buf, sb_oldref.buf, 0644)) {
+		ret = error("unable to copy logfile logs/%s to logs/"TMP_RENAMED_LOG": %s",
+			    oldrefname, strerror(errno));
+		goto out;
+	}
+
+	if (!copy && refs_delete_ref(&refs->base, logmsg, oldrefname,
 			    orig_oid.hash, REF_NODEREF)) {
 		error("unable to delete old %s", oldrefname);
 		goto rollback;
@@ -1810,7 +1295,7 @@ static int files_rename_ref(struct ref_store *ref_store,
 	 * the safety anyway; we want to delete the reference whatever
 	 * its current value.
 	 */
-	if (!refs_read_ref_full(&refs->base, newrefname,
+	if (!copy && !refs_read_ref_full(&refs->base, newrefname,
 				RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
 				oid.hash, NULL) &&
 	    refs_delete_ref(&refs->base, NULL, newrefname,
@@ -1841,7 +1326,10 @@ static int files_rename_ref(struct ref_store *ref_store,
 	lock = lock_ref_sha1_basic(refs, newrefname, NULL, NULL, NULL,
 				   REF_NODEREF, NULL, &err);
 	if (!lock) {
-		error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
+		if (copy)
+			error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
+		else
+			error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
 		strbuf_release(&err);
 		goto rollback;
 	}
@@ -1892,16 +1380,32 @@ static int files_rename_ref(struct ref_store *ref_store,
 	return ret;
 }
 
-static int close_ref(struct ref_lock *lock)
+static int files_rename_ref(struct ref_store *ref_store,
+			    const char *oldrefname, const char *newrefname,
+			    const char *logmsg)
+{
+	return files_copy_or_rename_ref(ref_store, oldrefname,
+				 newrefname, logmsg, 0);
+}
+
+static int files_copy_ref(struct ref_store *ref_store,
+			    const char *oldrefname, const char *newrefname,
+			    const char *logmsg)
+{
+	return files_copy_or_rename_ref(ref_store, oldrefname,
+				 newrefname, logmsg, 1);
+}
+
+static int close_ref_gently(struct ref_lock *lock)
 {
-	if (close_lock_file(lock->lk))
+	if (close_lock_file_gently(&lock->lk))
 		return -1;
 	return 0;
 }
 
 static int commit_ref(struct ref_lock *lock)
 {
-	char *path = get_locked_file_path(lock->lk);
+	char *path = get_locked_file_path(&lock->lk);
 	struct stat st;
 
 	if (!lstat(path, &st) && S_ISDIR(st.st_mode)) {
@@ -1925,7 +1429,7 @@ static int commit_ref(struct ref_lock *lock)
 		free(path);
 	}
 
-	if (commit_lock_file(lock->lk))
+	if (commit_lock_file(&lock->lk))
 		return -1;
 	return 0;
 }
@@ -2039,7 +1543,7 @@ static int log_ref_write_fd(int fd, const struct object_id *old_oid,
 
 	written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
 	free(logrec);
-	if (written != len)
+	if (written < 0)
 		return -1;
 
 	return 0;
@@ -2117,12 +1621,12 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
 		unlock_ref(lock);
 		return -1;
 	}
-	fd = get_lock_file_fd(lock->lk);
-	if (write_in_full(fd, oid_to_hex(oid), GIT_SHA1_HEXSZ) != GIT_SHA1_HEXSZ ||
-	    write_in_full(fd, &term, 1) != 1 ||
-	    close_ref(lock) < 0) {
+	fd = get_lock_file_fd(&lock->lk);
+	if (write_in_full(fd, oid_to_hex(oid), GIT_SHA1_HEXSZ) < 0 ||
+	    write_in_full(fd, &term, 1) < 0 ||
+	    close_ref_gently(lock) < 0) {
 		strbuf_addf(err,
-			    "couldn't write '%s'", get_lock_file_path(lock->lk));
+			    "couldn't write '%s'", get_lock_file_path(&lock->lk));
 		unlock_ref(lock);
 		return -1;
 	}
@@ -2166,13 +1670,12 @@ static int commit_ref_update(struct files_ref_store *refs,
 		 * check with HEAD only which should cover 99% of all usage
 		 * scenarios (even 100% of the default ones).
 		 */
-		struct object_id head_oid;
 		int head_flag;
 		const char *head_ref;
 
 		head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD",
 						   RESOLVE_REF_READING,
-						   head_oid.hash, &head_flag);
+						   NULL, &head_flag);
 		if (head_ref && (head_flag & REF_ISSYMREF) &&
 		    !strcmp(head_ref, lock->ref_name)) {
 			struct strbuf log_err = STRBUF_INIT;
@@ -2199,7 +1702,7 @@ static int create_ref_symlink(struct ref_lock *lock, const char *target)
 {
 	int ret = -1;
 #ifndef NO_SYMLINK_HEAD
-	char *ref_path = get_locked_file_path(lock->lk);
+	char *ref_path = get_locked_file_path(&lock->lk);
 	unlink(ref_path);
 	ret = symlink(target, ref_path);
 	free(ref_path);
@@ -2235,14 +1738,14 @@ static int create_symref_locked(struct files_ref_store *refs,
 		return 0;
 	}
 
-	if (!fdopen_lock_file(lock->lk, "w"))
+	if (!fdopen_lock_file(&lock->lk, "w"))
 		return error("unable to fdopen %s: %s",
-			     lock->lk->tempfile.filename.buf, strerror(errno));
+			     lock->lk.tempfile->filename.buf, strerror(errno));
 
 	update_symref_reflog(refs, lock, refname, target, logmsg);
 
 	/* no error check; commit_ref will check ferror */
-	fprintf(lock->lk->tempfile.fp, "ref: %s\n", target);
+	fprintf(lock->lk.tempfile->fp, "ref: %s\n", target);
 	if (commit_ref(lock) < 0)
 		return error("unable to write symref for %s: %s", refname,
 			     strerror(errno));
@@ -2549,23 +2052,64 @@ static struct ref_iterator_vtable files_reflog_iterator_vtable = {
 	files_reflog_iterator_abort
 };
 
-static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_store)
+static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
+						  const char *gitdir)
 {
-	struct files_ref_store *refs =
-		files_downcast(ref_store, REF_STORE_READ,
-			       "reflog_iterator_begin");
 	struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
 	struct ref_iterator *ref_iterator = &iter->base;
 	struct strbuf sb = STRBUF_INIT;
 
-	base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable);
-	files_reflog_path(refs, &sb, NULL);
+	base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
+	strbuf_addf(&sb, "%s/logs", gitdir);
 	iter->dir_iterator = dir_iterator_begin(sb.buf);
 	iter->ref_store = ref_store;
 	strbuf_release(&sb);
+
 	return ref_iterator;
 }
 
+static enum iterator_selection reflog_iterator_select(
+	struct ref_iterator *iter_worktree,
+	struct ref_iterator *iter_common,
+	void *cb_data)
+{
+	if (iter_worktree) {
+		/*
+		 * We're a bit loose here. We probably should ignore
+		 * common refs if they are accidentally added as
+		 * per-worktree refs.
+		 */
+		return ITER_SELECT_0;
+	} else if (iter_common) {
+		if (ref_type(iter_common->refname) == REF_TYPE_NORMAL)
+			return ITER_SELECT_1;
+
+		/*
+		 * The main ref store may contain main worktree's
+		 * per-worktree refs, which should be ignored
+		 */
+		return ITER_SKIP_1;
+	} else
+		return ITER_DONE;
+}
+
+static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_store)
+{
+	struct files_ref_store *refs =
+		files_downcast(ref_store, REF_STORE_READ,
+			       "reflog_iterator_begin");
+
+	if (!strcmp(refs->gitdir, refs->gitcommondir)) {
+		return reflog_iterator_begin(ref_store, refs->gitcommondir);
+	} else {
+		return merge_ref_iterator_begin(
+			0,
+			reflog_iterator_begin(ref_store, refs->gitdir),
+			reflog_iterator_begin(ref_store, refs->gitcommondir),
+			reflog_iterator_select, refs);
+	}
+}
+
 /*
  * If update is a direct update of head_ref (the reference pointed to
  * by HEAD), then add an extra REF_LOG_ONLY update for HEAD.
@@ -2589,11 +2133,10 @@ static int split_head_update(struct ref_update *update,
 
 	/*
 	 * First make sure that HEAD is not already in the
-	 * transaction. This insertion is O(N) in the transaction
+	 * transaction. This check is O(lg N) in the transaction
 	 * size, but it happens at most once per transaction.
 	 */
-	item = string_list_insert(affected_refnames, "HEAD");
-	if (item->util) {
+	if (string_list_has_string(affected_refnames, "HEAD")) {
 		/* An entry already existed */
 		strbuf_addf(err,
 			    "multiple updates for 'HEAD' (including one "
@@ -2608,6 +2151,14 @@ static int split_head_update(struct ref_update *update,
 			update->new_oid.hash, update->old_oid.hash,
 			update->msg);
 
+	/*
+	 * Add "HEAD". This insertion is O(N) in the transaction
+	 * size, but it happens at most once per transaction.
+	 * Add new_update->refname instead of a literal "HEAD".
+	 */
+	if (strcmp(new_update->refname, "HEAD"))
+		BUG("%s unexpectedly not 'HEAD'", new_update->refname);
+	item = string_list_insert(affected_refnames, new_update->refname);
 	item->util = new_update;
 
 	return 0;
@@ -2634,13 +2185,12 @@ static int split_symref_update(struct files_ref_store *refs,
 
 	/*
 	 * First make sure that referent is not already in the
-	 * transaction. This insertion is O(N) in the transaction
+	 * transaction. This check is O(lg N) in the transaction
 	 * size, but it happens at most once per symref in a
 	 * transaction.
 	 */
-	item = string_list_insert(affected_refnames, referent);
-	if (item->util) {
-		/* An entry already existed */
+	if (string_list_has_string(affected_refnames, referent)) {
+		/* An entry already exists */
 		strbuf_addf(err,
 			    "multiple updates for '%s' (including one "
 			    "via symref '%s') are not allowed",
@@ -2675,6 +2225,17 @@ static int split_symref_update(struct files_ref_store *refs,
 	update->flags |= REF_LOG_ONLY | REF_NODEREF;
 	update->flags &= ~REF_HAVE_OLD;
 
+	/*
+	 * Add the referent. This insertion is O(N) in the transaction
+	 * size, but it happens at most once per symref in a
+	 * transaction. Make sure to add new_update->refname, which will
+	 * be valid as long as affected_refnames is in use, and NOT
+	 * referent, which might soon be freed by our caller.
+	 */
+	item = string_list_insert(affected_refnames, new_update->refname);
+	if (item->util)
+		BUG("%s unexpectedly found in affected_refnames",
+		    new_update->refname);
 	item->util = new_update;
 
 	return 0;
@@ -2746,7 +2307,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 	struct strbuf referent = STRBUF_INIT;
 	int mustexist = (update->flags & REF_HAVE_OLD) &&
 		!is_null_oid(&update->old_oid);
-	int ret;
+	int ret = 0;
 	struct ref_lock *lock;
 
 	files_assert_main_repository(refs, "lock_ref_for_update");
@@ -2758,7 +2319,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 		ret = split_head_update(update, transaction, head_ref,
 					affected_refnames, err);
 		if (ret)
-			return ret;
+			goto out;
 	}
 
 	ret = lock_raw_ref(refs, update->refname, mustexist,
@@ -2772,7 +2333,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 		strbuf_addf(err, "cannot lock ref '%s': %s",
 			    original_update_refname(update), reason);
 		free(reason);
-		return ret;
+		goto out;
 	}
 
 	update->backend_data = lock;
@@ -2791,10 +2352,12 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 					strbuf_addf(err, "cannot lock ref '%s': "
 						    "error reading reference",
 						    original_update_refname(update));
-					return -1;
+					ret = TRANSACTION_GENERIC_ERROR;
+					goto out;
 				}
 			} else if (check_old_oid(update, &lock->old_oid, err)) {
-				return TRANSACTION_GENERIC_ERROR;
+				ret = TRANSACTION_GENERIC_ERROR;
+				goto out;
 			}
 		} else {
 			/*
@@ -2808,13 +2371,15 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 						  referent.buf, transaction,
 						  affected_refnames, err);
 			if (ret)
-				return ret;
+				goto out;
 		}
 	} else {
 		struct ref_update *parent_update;
 
-		if (check_old_oid(update, &lock->old_oid, err))
-			return TRANSACTION_GENERIC_ERROR;
+		if (check_old_oid(update, &lock->old_oid, err)) {
+			ret = TRANSACTION_GENERIC_ERROR;
+			goto out;
+		}
 
 		/*
 		 * If this update is happening indirectly because of a
@@ -2851,7 +2416,8 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 				    "cannot update ref '%s': %s",
 				    update->refname, write_err);
 			free(write_err);
-			return TRANSACTION_GENERIC_ERROR;
+			ret = TRANSACTION_GENERIC_ERROR;
+			goto out;
 		} else {
 			update->flags |= REF_NEEDS_COMMIT;
 		}
@@ -2862,22 +2428,35 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 		 * the lockfile is still open. Close it to
 		 * free up the file descriptor:
 		 */
-		if (close_ref(lock)) {
+		if (close_ref_gently(lock)) {
 			strbuf_addf(err, "couldn't close '%s.lock'",
 				    update->refname);
-			return TRANSACTION_GENERIC_ERROR;
+			ret = TRANSACTION_GENERIC_ERROR;
+			goto out;
 		}
 	}
-	return 0;
+
+out:
+	strbuf_release(&referent);
+	return ret;
 }
 
+struct files_transaction_backend_data {
+	struct ref_transaction *packed_transaction;
+	int packed_refs_locked;
+};
+
 /*
  * Unlock any references in `transaction` that are still locked, and
  * mark the transaction closed.
  */
-static void files_transaction_cleanup(struct ref_transaction *transaction)
+static void files_transaction_cleanup(struct files_ref_store *refs,
+				      struct ref_transaction *transaction)
 {
 	size_t i;
+	struct files_transaction_backend_data *backend_data =
+		transaction->backend_data;
+	struct strbuf err = STRBUF_INIT;
 
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
@@ -2889,6 +2468,17 @@ static void files_transaction_cleanup(struct ref_transaction *transaction)
 		}
 	}
 
+	if (backend_data->packed_transaction &&
+	    ref_transaction_abort(backend_data->packed_transaction, &err)) {
+		error("error aborting transaction: %s", err.buf);
+		strbuf_release(&err);
+	}
+
+	if (backend_data->packed_refs_locked)
+		packed_refs_unlock(refs->packed_ref_store);
+
+	free(backend_data);
+
 	transaction->state = REF_TRANSACTION_CLOSED;
 }
 
@@ -2904,13 +2494,17 @@ static int files_transaction_prepare(struct ref_store *ref_store,
 	struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 	char *head_ref = NULL;
 	int head_type;
-	struct object_id head_oid;
+	struct files_transaction_backend_data *backend_data;
+	struct ref_transaction *packed_transaction = NULL;
 
 	assert(err);
 
 	if (!transaction->nr)
 		goto cleanup;
 
+	backend_data = xcalloc(1, sizeof(*backend_data));
+	transaction->backend_data = backend_data;
+
 	/*
 	 * Fail if a refname appears more than once in the
 	 * transaction. (If we end up splitting up any updates using
@@ -2956,7 +2550,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
 	 */
 	head_ref = refs_resolve_refdup(ref_store, "HEAD",
 				       RESOLVE_REF_NO_RECURSE,
-				       head_oid.hash, &head_type);
+				       NULL, &head_type);
 
 	if (head_ref && !(head_type & REF_ISSYMREF)) {
 		FREE_AND_NULL(head_ref);
@@ -2976,7 +2570,42 @@ static int files_transaction_prepare(struct ref_store *ref_store,
 		ret = lock_ref_for_update(refs, update, transaction,
 					  head_ref, &affected_refnames, err);
 		if (ret)
-			break;
+			goto cleanup;
+
+		if (update->flags & REF_DELETING &&
+		    !(update->flags & REF_LOG_ONLY) &&
+		    !(update->flags & REF_ISPRUNING)) {
+			/*
+			 * This reference has to be deleted from
+			 * packed-refs if it exists there.
+			 */
+			if (!packed_transaction) {
+				packed_transaction = ref_store_transaction_begin(
+						refs->packed_ref_store, err);
+				if (!packed_transaction) {
+					ret = TRANSACTION_GENERIC_ERROR;
+					goto cleanup;
+				}
+
+				backend_data->packed_transaction =
+					packed_transaction;
+			}
+
+			ref_transaction_add_update(
+					packed_transaction, update->refname,
+					update->flags & ~REF_HAVE_OLD,
+					update->new_oid.hash, update->old_oid.hash,
+					NULL);
+		}
+	}
+
+	if (packed_transaction) {
+		if (packed_refs_lock(refs->packed_ref_store, 0, err)) {
+			ret = TRANSACTION_GENERIC_ERROR;
+			goto cleanup;
+		}
+		backend_data->packed_refs_locked = 1;
+		ret = ref_transaction_prepare(packed_transaction, err);
 	}
 
 cleanup:
@@ -2984,7 +2613,7 @@ cleanup:
 	string_list_clear(&affected_refnames, 0);
 
 	if (ret)
-		files_transaction_cleanup(transaction);
+		files_transaction_cleanup(refs, transaction);
 	else
 		transaction->state = REF_TRANSACTION_PREPARED;
 
@@ -2999,9 +2628,10 @@ static int files_transaction_finish(struct ref_store *ref_store,
 		files_downcast(ref_store, 0, "ref_transaction_finish");
 	size_t i;
 	int ret = 0;
-	struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
-	struct string_list_item *ref_to_delete;
 	struct strbuf sb = STRBUF_INIT;
+	struct files_transaction_backend_data *backend_data;
+	struct ref_transaction *packed_transaction;
+
 
 	assert(err);
 
@@ -3010,6 +2640,9 @@ static int files_transaction_finish(struct ref_store *ref_store,
 		return 0;
 	}
 
+	backend_data = transaction->backend_data;
+	packed_transaction = backend_data->packed_transaction;
+
 	/* Perform updates first so live commits remain referenced */
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
@@ -3045,7 +2678,44 @@ static int files_transaction_finish(struct ref_store *ref_store,
 			}
 		}
 	}
-	/* Perform deletes now that updates are safely completed */
+
+	/*
+	 * Now that updates are safely completed, we can perform
+	 * deletes. First delete the reflogs of any references that
+	 * will be deleted, since (in the unexpected event of an
+	 * error) leaving a reference without a reflog is less bad
+	 * than leaving a reflog without a reference (the latter is a
+	 * mildly invalid repository state):
+	 */
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
+		if (update->flags & REF_DELETING &&
+		    !(update->flags & REF_LOG_ONLY) &&
+		    !(update->flags & REF_ISPRUNING)) {
+			strbuf_reset(&sb);
+			files_reflog_path(refs, &sb, update->refname);
+			if (!unlink_or_warn(sb.buf))
+				try_remove_empty_parents(refs, update->refname,
+							 REMOVE_EMPTY_PARENTS_REFLOG);
+		}
+	}
+
+	/*
+	 * Perform deletes now that updates are safely completed.
+	 *
+	 * First delete any packed versions of the references, while
+	 * retaining the packed-refs lock:
+	 */
+	if (packed_transaction) {
+		ret = ref_transaction_commit(packed_transaction, err);
+		ref_transaction_free(packed_transaction);
+		packed_transaction = NULL;
+		backend_data->packed_transaction = NULL;
+		if (ret)
+			goto cleanup;
+	}
+
+	/* Now delete the loose versions of the references: */
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
 		struct ref_lock *lock = update->backend_data;
@@ -3063,31 +2733,13 @@ static int files_transaction_finish(struct ref_store *ref_store,
 				}
 				update->flags |= REF_DELETED_LOOSE;
 			}
-
-			if (!(update->flags & REF_ISPRUNING))
-				string_list_append(&refs_to_delete,
-						   lock->ref_name);
 		}
 	}
 
-	if (repack_without_refs(refs, &refs_to_delete, err)) {
-		ret = TRANSACTION_GENERIC_ERROR;
-		goto cleanup;
-	}
-
-	/* Delete the reflogs of any references that were deleted: */
-	for_each_string_list_item(ref_to_delete, &refs_to_delete) {
-		strbuf_reset(&sb);
-		files_reflog_path(refs, &sb, ref_to_delete->string);
-		if (!unlink_or_warn(sb.buf))
-			try_remove_empty_parents(refs, ref_to_delete->string,
-						 REMOVE_EMPTY_PARENTS_REFLOG);
-	}
-
 	clear_loose_ref_cache(refs);
 
 cleanup:
-	files_transaction_cleanup(transaction);
+	files_transaction_cleanup(refs, transaction);
 
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
@@ -3105,7 +2757,6 @@ cleanup:
 	}
 
 	strbuf_release(&sb);
-	string_list_clear(&refs_to_delete, 0);
 	return ret;
 }
 
@@ -3113,7 +2764,10 @@ static int files_transaction_abort(struct ref_store *ref_store,
 				   struct ref_transaction *transaction,
 				   struct strbuf *err)
 {
-	files_transaction_cleanup(transaction);
+	struct files_ref_store *refs =
+		files_downcast(ref_store, 0, "ref_transaction_abort");
+
+	files_transaction_cleanup(refs, transaction);
 	return 0;
 }
 
@@ -3135,6 +2789,7 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
 	size_t i;
 	int ret = 0;
 	struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+	struct ref_transaction *packed_transaction = NULL;
 
 	assert(err);
 
@@ -3167,6 +2822,12 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
 				 &affected_refnames))
 		die("BUG: initial ref transaction called with existing refs");
 
+	packed_transaction = ref_store_transaction_begin(refs->packed_ref_store, err);
+	if (!packed_transaction) {
+		ret = TRANSACTION_GENERIC_ERROR;
+		goto cleanup;
+	}
+
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
 
@@ -3179,32 +2840,31 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
 			ret = TRANSACTION_NAME_CONFLICT;
 			goto cleanup;
 		}
+
+		/*
+		 * Add a reference creation for this reference to the
+		 * packed-refs transaction:
+		 */
+		ref_transaction_add_update(packed_transaction, update->refname,
+					   update->flags & ~REF_HAVE_OLD,
+					   update->new_oid.hash, update->old_oid.hash,
+					   NULL);
 	}
 
-	if (lock_packed_refs(refs, 0)) {
-		strbuf_addf(err, "unable to lock packed-refs file: %s",
-			    strerror(errno));
+	if (packed_refs_lock(refs->packed_ref_store, 0, err)) {
 		ret = TRANSACTION_GENERIC_ERROR;
 		goto cleanup;
 	}
 
-	for (i = 0; i < transaction->nr; i++) {
-		struct ref_update *update = transaction->updates[i];
-
-		if ((update->flags & REF_HAVE_NEW) &&
-		    !is_null_oid(&update->new_oid))
-			add_packed_ref(refs, update->refname,
-				       &update->new_oid);
-	}
-
-	if (commit_packed_refs(refs)) {
-		strbuf_addf(err, "unable to commit packed-refs file: %s",
-			    strerror(errno));
+	if (initial_ref_transaction_commit(packed_transaction, err)) {
 		ret = TRANSACTION_GENERIC_ERROR;
 		goto cleanup;
 	}
 
 cleanup:
+	if (packed_transaction)
+		ref_transaction_free(packed_transaction);
+	packed_refs_unlock(refs->packed_ref_store);
 	transaction->state = REF_TRANSACTION_CLOSED;
 	string_list_clear(&affected_refnames, 0);
 	return ret;
@@ -3333,16 +2993,17 @@ static int files_reflog_expire(struct ref_store *ref_store,
 			!(type & REF_ISSYMREF) &&
 			!is_null_oid(&cb.last_kept_oid);
 
-		if (close_lock_file(&reflog_lock)) {
+		if (close_lock_file_gently(&reflog_lock)) {
 			status |= error("couldn't write %s: %s", log_file,
 					strerror(errno));
+			rollback_lock_file(&reflog_lock);
 		} else if (update &&
-			   (write_in_full(get_lock_file_fd(lock->lk),
-				oid_to_hex(&cb.last_kept_oid), GIT_SHA1_HEXSZ) != GIT_SHA1_HEXSZ ||
-			    write_str_in_full(get_lock_file_fd(lock->lk), "\n") != 1 ||
-			    close_ref(lock) < 0)) {
+			   (write_in_full(get_lock_file_fd(&lock->lk),
+				oid_to_hex(&cb.last_kept_oid), GIT_SHA1_HEXSZ) < 0 ||
+			    write_str_in_full(get_lock_file_fd(&lock->lk), "\n") < 0 ||
+			    close_ref_gently(lock) < 0)) {
 			status |= error("couldn't write %s",
-					get_lock_file_path(lock->lk));
+					get_lock_file_path(&lock->lk));
 			rollback_lock_file(&reflog_lock);
 		} else if (commit_lock_file(&reflog_lock)) {
 			status |= error("unable to write reflog '%s' (%s)",
@@ -3393,10 +3054,10 @@ struct ref_storage_be refs_be_files = {
 	files_initial_transaction_commit,
 
 	files_pack_refs,
-	files_peel_ref,
 	files_create_symref,
 	files_delete_refs,
 	files_rename_ref,
+	files_copy_ref,
 
 	files_ref_iterator_begin,
 	files_read_raw_ref,
diff --git a/refs/iterator.c b/refs/iterator.c
index 4cf449ef6..bd35da4e6 100644
--- a/refs/iterator.c
+++ b/refs/iterator.c
@@ -25,9 +25,11 @@ int ref_iterator_abort(struct ref_iterator *ref_iterator)
 }
 
 void base_ref_iterator_init(struct ref_iterator *iter,
-			    struct ref_iterator_vtable *vtable)
+			    struct ref_iterator_vtable *vtable,
+			    int ordered)
 {
 	iter->vtable = vtable;
+	iter->ordered = !!ordered;
 	iter->refname = NULL;
 	iter->oid = NULL;
 	iter->flags = 0;
@@ -72,7 +74,7 @@ struct ref_iterator *empty_ref_iterator_begin(void)
 	struct empty_ref_iterator *iter = xcalloc(1, sizeof(*iter));
 	struct ref_iterator *ref_iterator = &iter->base;
 
-	base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable);
+	base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable, 1);
 	return ref_iterator;
 }
 
@@ -205,6 +207,7 @@ static struct ref_iterator_vtable merge_ref_iterator_vtable = {
 };
 
 struct ref_iterator *merge_ref_iterator_begin(
+		int ordered,
 		struct ref_iterator *iter0, struct ref_iterator *iter1,
 		ref_iterator_select_fn *select, void *cb_data)
 {
@@ -219,7 +222,7 @@ struct ref_iterator *merge_ref_iterator_begin(
 	 * references through only if they exist in both iterators.
 	 */
 
-	base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable);
+	base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable, ordered);
 	iter->iter0 = iter0;
 	iter->iter1 = iter1;
 	iter->select = select;
@@ -268,9 +271,11 @@ struct ref_iterator *overlay_ref_iterator_begin(
 	} else if (is_empty_ref_iterator(back)) {
 		ref_iterator_abort(back);
 		return front;
+	} else if (!front->ordered || !back->ordered) {
+		BUG("overlay_ref_iterator requires ordered inputs");
 	}
 
-	return merge_ref_iterator_begin(front, back,
+	return merge_ref_iterator_begin(1, front, back,
 					overlay_iterator_select, NULL);
 }
 
@@ -282,6 +287,20 @@ struct prefix_ref_iterator {
 	int trim;
 };
 
+/* Return -1, 0, 1 if refname is before, inside, or after the prefix. */
+static int compare_prefix(const char *refname, const char *prefix)
+{
+	while (*prefix) {
+		if (*refname != *prefix)
+			return ((unsigned char)*refname < (unsigned char)*prefix) ? -1 : +1;
+
+		refname++;
+		prefix++;
+	}
+
+	return 0;
+}
+
 static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator)
 {
 	struct prefix_ref_iterator *iter =
@@ -289,9 +308,25 @@ static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator)
 	int ok;
 
 	while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
-		if (!starts_with(iter->iter0->refname, iter->prefix))
+		int cmp = compare_prefix(iter->iter0->refname, iter->prefix);
+
+		if (cmp < 0)
 			continue;
 
+		if (cmp > 0) {
+			/*
+			 * If the source iterator is ordered, then we
+			 * can stop the iteration as soon as we see a
+			 * refname that comes after the prefix:
+			 */
+			if (iter->iter0->ordered) {
+				ok = ref_iterator_abort(iter->iter0);
+				break;
+			} else {
+				continue;
+			}
+		}
+
 		if (iter->trim) {
 			/*
 			 * It is nonsense to trim off characters that
@@ -361,7 +396,7 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
 	iter = xcalloc(1, sizeof(*iter));
 	ref_iterator = &iter->base;
 
-	base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable);
+	base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable, iter0->ordered);
 
 	iter->iter0 = iter0;
 	iter->prefix = xstrdup(prefix);
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
new file mode 100644
index 000000000..3279d42c5
--- /dev/null
+++ b/refs/packed-backend.c
@@ -0,0 +1,1558 @@
+#include "../cache.h"
+#include "../config.h"
+#include "../refs.h"
+#include "refs-internal.h"
+#include "packed-backend.h"
+#include "../iterator.h"
+#include "../lockfile.h"
+
+enum mmap_strategy {
+	/*
+	 * Don't use mmap() at all for reading `packed-refs`.
+	 */
+	MMAP_NONE,
+
+	/*
+	 * Can use mmap() for reading `packed-refs`, but the file must
+	 * not remain mmapped. This is the usual option on Windows,
+	 * where you cannot rename a new version of a file onto a file
+	 * that is currently mmapped.
+	 */
+	MMAP_TEMPORARY,
+
+	/*
+	 * It is OK to leave the `packed-refs` file mmapped while
+	 * arbitrary other code is running.
+	 */
+	MMAP_OK
+};
+
+#if defined(NO_MMAP)
+static enum mmap_strategy mmap_strategy = MMAP_NONE;
+#elif defined(MMAP_PREVENTS_DELETE)
+static enum mmap_strategy mmap_strategy = MMAP_TEMPORARY;
+#else
+static enum mmap_strategy mmap_strategy = MMAP_OK;
+#endif
+
+struct packed_ref_store;
+
+/*
+ * A `snapshot` represents one snapshot of a `packed-refs` file.
+ *
+ * Normally, this will be a mmapped view of the contents of the
+ * `packed-refs` file at the time the snapshot was created. However,
+ * if the `packed-refs` file was not sorted, this might point at heap
+ * memory holding the contents of the `packed-refs` file with its
+ * records sorted by refname.
+ *
+ * `snapshot` instances are reference counted (via
+ * `acquire_snapshot()` and `release_snapshot()`). This is to prevent
+ * an instance from disappearing while an iterator is still iterating
+ * over it. Instances are garbage collected when their `referrers`
+ * count goes to zero.
+ *
+ * The most recent `snapshot`, if available, is referenced by the
+ * `packed_ref_store`. Its freshness is checked whenever
+ * `get_snapshot()` is called; if the existing snapshot is obsolete, a
+ * new snapshot is taken.
+ */
+struct snapshot {
+	/*
+	 * A back-pointer to the packed_ref_store with which this
+	 * snapshot is associated:
+	 */
+	struct packed_ref_store *refs;
+
+	/* Is the `packed-refs` file currently mmapped? */
+	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.
+	 */
+	char *buf, *eof;
+
+	/* The size of the header line, if any; otherwise, 0: */
+	size_t header_len;
+
+	/*
+	 * What is the peeled state of the `packed-refs` file that
+	 * this snapshot represents? (This is usually determined from
+	 * the file's header.)
+	 */
+	enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled;
+
+	/*
+	 * Count of references to this instance, including the pointer
+	 * from `packed_ref_store::snapshot`, if any. The instance
+	 * will not be freed as long as the reference count is
+	 * nonzero.
+	 */
+	unsigned int referrers;
+
+	/*
+	 * The metadata of the `packed-refs` file from which this
+	 * snapshot was created, used to tell if the file has been
+	 * replaced since we read it.
+	 */
+	struct stat_validity validity;
+};
+
+/*
+ * A `ref_store` representing references stored in a `packed-refs`
+ * file. It implements the `ref_store` interface, though it has some
+ * limitations:
+ *
+ * - It cannot store symbolic references.
+ *
+ * - It cannot store reflogs.
+ *
+ * - It does not support reference renaming (though it could).
+ *
+ * On the other hand, it can be locked outside of a reference
+ * transaction. In that case, it remains locked even after the
+ * transaction is done and the new `packed-refs` file is activated.
+ */
+struct packed_ref_store {
+	struct ref_store base;
+
+	unsigned int store_flags;
+
+	/* The path of the "packed-refs" file: */
+	char *path;
+
+	/*
+	 * A snapshot of the values read from the `packed-refs` file,
+	 * if it might still be current; otherwise, NULL.
+	 */
+	struct snapshot *snapshot;
+
+	/*
+	 * Lock used for the "packed-refs" file. Note that this (and
+	 * thus the enclosing `packed_ref_store`) must not be freed.
+	 */
+	struct lock_file lock;
+
+	/*
+	 * Temporary file used when rewriting new contents to the
+	 * "packed-refs" file. Note that this (and thus the enclosing
+	 * `packed_ref_store`) must not be freed.
+	 */
+	struct tempfile *tempfile;
+};
+
+/*
+ * Increment the reference count of `*snapshot`.
+ */
+static void acquire_snapshot(struct snapshot *snapshot)
+{
+	snapshot->referrers++;
+}
+
+/*
+ * If the buffer in `snapshot` is active, then either munmap the
+ * memory and close the file, or free the memory. Then set the buffer
+ * pointers to NULL.
+ */
+static void clear_snapshot_buffer(struct snapshot *snapshot)
+{
+	if (snapshot->mmapped) {
+		if (munmap(snapshot->buf, snapshot->eof - snapshot->buf))
+			die_errno("error ummapping packed-refs file %s",
+				  snapshot->refs->path);
+		snapshot->mmapped = 0;
+	} else {
+		free(snapshot->buf);
+	}
+	snapshot->buf = snapshot->eof = NULL;
+	snapshot->header_len = 0;
+}
+
+/*
+ * Decrease the reference count of `*snapshot`. If it goes to zero,
+ * free `*snapshot` and return true; otherwise return false.
+ */
+static int release_snapshot(struct snapshot *snapshot)
+{
+	if (!--snapshot->referrers) {
+		stat_validity_clear(&snapshot->validity);
+		clear_snapshot_buffer(snapshot);
+		free(snapshot);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+struct ref_store *packed_ref_store_create(const char *path,
+					  unsigned int store_flags)
+{
+	struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
+	struct ref_store *ref_store = (struct ref_store *)refs;
+
+	base_ref_store_init(ref_store, &refs_be_packed);
+	refs->store_flags = store_flags;
+
+	refs->path = xstrdup(path);
+	return ref_store;
+}
+
+/*
+ * Downcast `ref_store` to `packed_ref_store`. Die if `ref_store` is
+ * not a `packed_ref_store`. Also die if `packed_ref_store` doesn't
+ * support at least the flags specified in `required_flags`. `caller`
+ * is used in any necessary error messages.
+ */
+static struct packed_ref_store *packed_downcast(struct ref_store *ref_store,
+						unsigned int required_flags,
+						const char *caller)
+{
+	struct packed_ref_store *refs;
+
+	if (ref_store->be != &refs_be_packed)
+		die("BUG: ref_store is type \"%s\" not \"packed\" in %s",
+		    ref_store->be->name, caller);
+
+	refs = (struct packed_ref_store *)ref_store;
+
+	if ((refs->store_flags & required_flags) != required_flags)
+		die("BUG: unallowed operation (%s), requires %x, has %x\n",
+		    caller, required_flags, refs->store_flags);
+
+	return refs;
+}
+
+static void clear_snapshot(struct packed_ref_store *refs)
+{
+	if (refs->snapshot) {
+		struct snapshot *snapshot = refs->snapshot;
+
+		refs->snapshot = NULL;
+		release_snapshot(snapshot);
+	}
+}
+
+static NORETURN void die_unterminated_line(const char *path,
+					   const char *p, size_t len)
+{
+	if (len < 80)
+		die("unterminated line in %s: %.*s", path, (int)len, p);
+	else
+		die("unterminated line in %s: %.75s...", path, p);
+}
+
+static NORETURN void die_invalid_line(const char *path,
+				      const char *p, size_t len)
+{
+	const char *eol = memchr(p, '\n', len);
+
+	if (!eol)
+		die_unterminated_line(path, p, len);
+	else if (eol - p < 80)
+		die("unexpected line in %s: %.*s", path, (int)(eol - p), p);
+	else
+		die("unexpected line in %s: %.75s...", path, p);
+
+}
+
+struct snapshot_record {
+	const char *start;
+	size_t len;
+};
+
+static int cmp_packed_ref_records(const void *v1, const void *v2)
+{
+	const struct snapshot_record *e1 = v1, *e2 = v2;
+	const char *r1 = e1->start + GIT_SHA1_HEXSZ + 1;
+	const char *r2 = e2->start + GIT_SHA1_HEXSZ + 1;
+
+	while (1) {
+		if (*r1 == '\n')
+			return *r2 == '\n' ? 0 : -1;
+		if (*r1 != *r2) {
+			if (*r2 == '\n')
+				return 1;
+			else
+				return (unsigned char)*r1 < (unsigned char)*r2 ? -1 : +1;
+		}
+		r1++;
+		r2++;
+	}
+}
+
+/*
+ * Compare a snapshot record at `rec` to the specified NUL-terminated
+ * refname.
+ */
+static int cmp_record_to_refname(const char *rec, const char *refname)
+{
+	const char *r1 = rec + GIT_SHA1_HEXSZ + 1;
+	const char *r2 = refname;
+
+	while (1) {
+		if (*r1 == '\n')
+			return *r2 ? -1 : 0;
+		if (!*r2)
+			return 1;
+		if (*r1 != *r2)
+			return (unsigned char)*r1 < (unsigned char)*r2 ? -1 : +1;
+		r1++;
+		r2++;
+	}
+}
+
+/*
+ * `snapshot->buf` is not known to be sorted. Check whether it is, and
+ * if not, sort it into new memory and munmap/free the old storage.
+ */
+static void sort_snapshot(struct snapshot *snapshot)
+{
+	struct snapshot_record *records = NULL;
+	size_t alloc = 0, nr = 0;
+	int sorted = 1;
+	const char *pos, *eof, *eol;
+	size_t len, i;
+	char *new_buffer, *dst;
+
+	pos = snapshot->buf + snapshot->header_len;
+	eof = snapshot->eof;
+	len = eof - pos;
+
+	if (!len)
+		return;
+
+	/*
+	 * Initialize records based on a crude estimate of the number
+	 * of references in the file (we'll grow it below if needed):
+	 */
+	ALLOC_GROW(records, len / 80 + 20, alloc);
+
+	while (pos < eof) {
+		eol = memchr(pos, '\n', eof - pos);
+		if (!eol)
+			/* The safety check should prevent this. */
+			BUG("unterminated line found in packed-refs");
+		if (eol - pos < GIT_SHA1_HEXSZ + 2)
+			die_invalid_line(snapshot->refs->path,
+					 pos, eof - pos);
+		eol++;
+		if (eol < eof && *eol == '^') {
+			/*
+			 * Keep any peeled line together with its
+			 * reference:
+			 */
+			const char *peeled_start = eol;
+
+			eol = memchr(peeled_start, '\n', eof - peeled_start);
+			if (!eol)
+				/* The safety check should prevent this. */
+				BUG("unterminated peeled line found in packed-refs");
+			eol++;
+		}
+
+		ALLOC_GROW(records, nr + 1, alloc);
+		records[nr].start = pos;
+		records[nr].len = eol - pos;
+		nr++;
+
+		if (sorted &&
+		    nr > 1 &&
+		    cmp_packed_ref_records(&records[nr - 2],
+					   &records[nr - 1]) >= 0)
+			sorted = 0;
+
+		pos = eol;
+	}
+
+	if (sorted)
+		goto cleanup;
+
+	/* We need to sort the memory. First we sort the records array: */
+	QSORT(records, nr, cmp_packed_ref_records);
+
+	/*
+	 * Allocate a new chunk of memory, and copy the old memory to
+	 * the new in the order indicated by `records` (not bothering
+	 * with the header line):
+	 */
+	new_buffer = xmalloc(len);
+	for (dst = new_buffer, i = 0; i < nr; i++) {
+		memcpy(dst, records[i].start, records[i].len);
+		dst += records[i].len;
+	}
+
+	/*
+	 * Now munmap the old buffer and use the sorted buffer in its
+	 * place:
+	 */
+	clear_snapshot_buffer(snapshot);
+	snapshot->buf = new_buffer;
+	snapshot->eof = new_buffer + len;
+	snapshot->header_len = 0;
+
+cleanup:
+	free(records);
+}
+
+/*
+ * Return a pointer to the start of the record that contains the
+ * character `*p` (which must be within the buffer). If no other
+ * record start is found, return `buf`.
+ */
+static const char *find_start_of_record(const char *buf, const char *p)
+{
+	while (p > buf && (p[-1] != '\n' || p[0] == '^'))
+		p--;
+	return p;
+}
+
+/*
+ * Return a pointer to the start of the record following the record
+ * that contains `*p`. If none is found before `end`, return `end`.
+ */
+static const char *find_end_of_record(const char *p, const char *end)
+{
+	while (++p < end && (p[-1] != '\n' || p[0] == '^'))
+		;
+	return p;
+}
+
+/*
+ * We want to be able to compare mmapped reference records quickly,
+ * without totally parsing them. We can do so because the records are
+ * LF-terminated, and the refname should start exactly (GIT_SHA1_HEXSZ
+ * + 1) bytes past the beginning of the record.
+ *
+ * But what if the `packed-refs` file contains garbage? We're willing
+ * to tolerate not detecting the problem, as long as we don't produce
+ * totally garbled output (we can't afford to check the integrity of
+ * the whole file during every Git invocation). But we do want to be
+ * sure that we never read past the end of the buffer in memory and
+ * perform an illegal memory access.
+ *
+ * Guarantee that minimum level of safety by verifying that the last
+ * record in the file is LF-terminated, and that it has at least
+ * (GIT_SHA1_HEXSZ + 1) characters before the LF. Die if either of
+ * these checks fails.
+ */
+static void verify_buffer_safe(struct snapshot *snapshot)
+{
+	const char *buf = snapshot->buf + snapshot->header_len;
+	const char *eof = snapshot->eof;
+	const char *last_line;
+
+	if (buf == eof)
+		return;
+
+	last_line = find_start_of_record(buf, eof - 1);
+	if (*(eof - 1) != '\n' || eof - last_line < GIT_SHA1_HEXSZ + 2)
+		die_invalid_line(snapshot->refs->path,
+				 last_line, eof - last_line);
+}
+
+/*
+ * 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.
+ */
+static int load_contents(struct snapshot *snapshot)
+{
+	int fd;
+	struct stat st;
+	size_t size;
+	ssize_t bytes_read;
+
+	fd = open(snapshot->refs->path, O_RDONLY);
+	if (fd < 0) {
+		if (errno == ENOENT) {
+			/*
+			 * This is OK; it just means that no
+			 * "packed-refs" file has been written yet,
+			 * which is equivalent to it being empty,
+			 * which is its state when initialized with
+			 * zeros.
+			 */
+			return 0;
+		} else {
+			die_errno("couldn't read %s", snapshot->refs->path);
+		}
+	}
+
+	stat_validity_update(&snapshot->validity, fd);
+
+	if (fstat(fd, &st) < 0)
+		die_errno("couldn't stat %s", snapshot->refs->path);
+	size = xsize_t(st.st_size);
+
+	switch (mmap_strategy) {
+	case MMAP_NONE:
+		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:
+		snapshot->buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+		snapshot->eof = snapshot->buf + size;
+		snapshot->mmapped = 1;
+		break;
+	}
+	close(fd);
+
+	return 1;
+}
+
+/*
+ * Find the place in `snapshot->buf` where the start of the record for
+ * `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.
+ *
+ * The record is sought using a binary search, so `snapshot->buf` must
+ * be sorted.
+ */
+static const char *find_reference_location(struct snapshot *snapshot,
+					   const char *refname, int mustexist)
+{
+	/*
+	 * This is not *quite* a garden-variety binary search, because
+	 * the data we're searching is made up of records, and we
+	 * always need to find the beginning of a record to do a
+	 * comparison. A "record" here is one line for the reference
+	 * itself and zero or one peel lines that start with '^'. Our
+	 * loop invariant is described in the next two comments.
+	 */
+
+	/*
+	 * A pointer to the character at the start of a record whose
+	 * preceding records all have reference names that come
+	 * *before* `refname`.
+	 */
+	const char *lo = snapshot->buf + snapshot->header_len;
+
+	/*
+	 * A pointer to a the first character of a record whose
+	 * reference name comes *after* `refname`.
+	 */
+	const char *hi = snapshot->eof;
+
+	while (lo < hi) {
+		const char *mid, *rec;
+		int cmp;
+
+		mid = lo + (hi - lo) / 2;
+		rec = find_start_of_record(lo, mid);
+		cmp = cmp_record_to_refname(rec, refname);
+		if (cmp < 0) {
+			lo = find_end_of_record(mid, hi);
+		} else if (cmp > 0) {
+			hi = rec;
+		} else {
+			return rec;
+		}
+	}
+
+	if (mustexist)
+		return NULL;
+	else
+		return lo;
+}
+
+/*
+ * Create a newly-allocated `snapshot` of the `packed-refs` file in
+ * its current state and return it. The return value will already have
+ * its reference count incremented.
+ *
+ * A comment line of the form "# pack-refs with: " may contain zero or
+ * more traits. We interpret the traits as follows:
+ *
+ *   Neither `peeled` nor `fully-peeled`:
+ *
+ *      Probably no references are peeled. But if the file contains a
+ *      peeled value for a reference, we will use it.
+ *
+ *   `peeled`:
+ *
+ *      References under "refs/tags/", if they *can* be peeled, *are*
+ *      peeled in this file. References outside of "refs/tags/" are
+ *      probably not peeled even if they could have been, but if we find
+ *      a peeled value for such a reference we will use it.
+ *
+ *   `fully-peeled`:
+ *
+ *      All references in the file that can be peeled are peeled.
+ *      Inversely (and this is more important), any references in the
+ *      file for which no peeled value is recorded is not peelable. This
+ *      trait should typically be written alongside "peeled" for
+ *      compatibility with older clients, but we do not require it
+ *      (i.e., "peeled" is a no-op if "fully-peeled" is set).
+ *
+ *   `sorted`:
+ *
+ *      The references in this file are known to be sorted by refname.
+ */
+static struct snapshot *create_snapshot(struct packed_ref_store *refs)
+{
+	struct snapshot *snapshot = xcalloc(1, sizeof(*snapshot));
+	int sorted = 0;
+
+	snapshot->refs = refs;
+	acquire_snapshot(snapshot);
+	snapshot->peeled = PEELED_NONE;
+
+	if (!load_contents(snapshot))
+		return snapshot;
+
+	/* 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;
+		struct string_list traits = STRING_LIST_INIT_NODUP;
+
+		eol = memchr(snapshot->buf, '\n',
+			     snapshot->eof - snapshot->buf);
+		if (!eol)
+			die_unterminated_line(refs->path,
+					      snapshot->buf,
+					      snapshot->eof - snapshot->buf);
+
+		strbuf_add(&tmp, snapshot->buf, eol - snapshot->buf);
+
+		if (!skip_prefix(tmp.buf, "# pack-refs with:", (const char **)&p))
+			die_invalid_line(refs->path,
+					 snapshot->buf,
+					 snapshot->eof - snapshot->buf);
+
+		string_list_split_in_place(&traits, p, ' ', -1);
+
+		if (unsorted_string_list_has_string(&traits, "fully-peeled"))
+			snapshot->peeled = PEELED_FULLY;
+		else if (unsorted_string_list_has_string(&traits, "peeled"))
+			snapshot->peeled = PEELED_TAGS;
+
+		sorted = unsorted_string_list_has_string(&traits, "sorted");
+
+		/* perhaps other traits later as well */
+
+		/* The "+ 1" is for the LF character. */
+		snapshot->header_len = eol + 1 - snapshot->buf;
+
+		string_list_clear(&traits, 0);
+		strbuf_release(&tmp);
+	}
+
+	verify_buffer_safe(snapshot);
+
+	if (!sorted) {
+		sort_snapshot(snapshot);
+
+		/*
+		 * Reordering the records might have moved a short one
+		 * to the end of the buffer, so verify the buffer's
+		 * safety again:
+		 */
+		verify_buffer_safe(snapshot);
+	}
+
+	if (mmap_strategy != MMAP_OK && snapshot->mmapped) {
+		/*
+		 * 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);
+		char *buf_copy = xmalloc(size);
+
+		memcpy(buf_copy, snapshot->buf + snapshot->header_len, size);
+		clear_snapshot_buffer(snapshot);
+		snapshot->buf = buf_copy;
+		snapshot->eof = buf_copy + size;
+	}
+
+	return snapshot;
+}
+
+/*
+ * Check that `refs->snapshot` (if present) still reflects the
+ * contents of the `packed-refs` file. If not, clear the snapshot.
+ */
+static void validate_snapshot(struct packed_ref_store *refs)
+{
+	if (refs->snapshot &&
+	    !stat_validity_check(&refs->snapshot->validity, refs->path))
+		clear_snapshot(refs);
+}
+
+/*
+ * Get the `snapshot` for the specified packed_ref_store, creating and
+ * populating it if it hasn't been read before or if the file has been
+ * changed (according to its `validity` field) since it was last read.
+ * On the other hand, if we hold the lock, then assume that the file
+ * hasn't been changed out from under us, so skip the extra `stat()`
+ * call in `stat_validity_check()`. This function does *not* increase
+ * the snapshot's reference count on behalf of the caller.
+ */
+static struct snapshot *get_snapshot(struct packed_ref_store *refs)
+{
+	if (!is_lock_file_locked(&refs->lock))
+		validate_snapshot(refs);
+
+	if (!refs->snapshot)
+		refs->snapshot = create_snapshot(refs);
+
+	return refs->snapshot;
+}
+
+static int packed_read_raw_ref(struct ref_store *ref_store,
+			       const char *refname, unsigned char *sha1,
+			       struct strbuf *referent, unsigned int *type)
+{
+	struct packed_ref_store *refs =
+		packed_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
+	struct snapshot *snapshot = get_snapshot(refs);
+	const char *rec;
+
+	*type = 0;
+
+	rec = find_reference_location(snapshot, refname, 1);
+
+	if (!rec) {
+		/* refname is not a packed reference. */
+		errno = ENOENT;
+		return -1;
+	}
+
+	if (get_sha1_hex(rec, sha1))
+		die_invalid_line(refs->path, rec, snapshot->eof - rec);
+
+	*type = REF_ISPACKED;
+	return 0;
+}
+
+/*
+ * This value is set in `base.flags` if the peeled value of the
+ * current reference is known. In that case, `peeled` contains the
+ * correct peeled value for the reference, which might be `null_sha1`
+ * if the reference is not a tag or if it is broken.
+ */
+#define REF_KNOWS_PEELED 0x40
+
+/*
+ * An iterator over a snapshot of a `packed-refs` file.
+ */
+struct packed_ref_iterator {
+	struct ref_iterator base;
+
+	struct snapshot *snapshot;
+
+	/* The current position in the snapshot's buffer: */
+	const char *pos;
+
+	/* The end of the part of the buffer that will be iterated over: */
+	const char *eof;
+
+	/* Scratch space for current values: */
+	struct object_id oid, peeled;
+	struct strbuf refname_buf;
+
+	unsigned int flags;
+};
+
+/*
+ * Move the iterator to the next record in the snapshot, without
+ * respect for whether the record is actually required by the current
+ * iteration. Adjust the fields in `iter` and return `ITER_OK` or
+ * `ITER_DONE`. This function does not free the iterator in the case
+ * of `ITER_DONE`.
+ */
+static int next_record(struct packed_ref_iterator *iter)
+{
+	const char *p = iter->pos, *eol;
+
+	strbuf_reset(&iter->refname_buf);
+
+	if (iter->pos == iter->eof)
+		return ITER_DONE;
+
+	iter->base.flags = REF_ISPACKED;
+
+	if (iter->eof - p < GIT_SHA1_HEXSZ + 2 ||
+	    parse_oid_hex(p, &iter->oid, &p) ||
+	    !isspace(*p++))
+		die_invalid_line(iter->snapshot->refs->path,
+				 iter->pos, iter->eof - iter->pos);
+
+	eol = memchr(p, '\n', iter->eof - p);
+	if (!eol)
+		die_unterminated_line(iter->snapshot->refs->path,
+				      iter->pos, iter->eof - iter->pos);
+
+	strbuf_add(&iter->refname_buf, p, eol - p);
+	iter->base.refname = iter->refname_buf.buf;
+
+	if (check_refname_format(iter->base.refname, REFNAME_ALLOW_ONELEVEL)) {
+		if (!refname_is_safe(iter->base.refname))
+			die("packed refname is dangerous: %s",
+			    iter->base.refname);
+		oidclr(&iter->oid);
+		iter->base.flags |= REF_BAD_NAME | REF_ISBROKEN;
+	}
+	if (iter->snapshot->peeled == PEELED_FULLY ||
+	    (iter->snapshot->peeled == PEELED_TAGS &&
+	     starts_with(iter->base.refname, "refs/tags/")))
+		iter->base.flags |= REF_KNOWS_PEELED;
+
+	iter->pos = eol + 1;
+
+	if (iter->pos < iter->eof && *iter->pos == '^') {
+		p = iter->pos + 1;
+		if (iter->eof - p < GIT_SHA1_HEXSZ + 1 ||
+		    parse_oid_hex(p, &iter->peeled, &p) ||
+		    *p++ != '\n')
+			die_invalid_line(iter->snapshot->refs->path,
+					 iter->pos, iter->eof - iter->pos);
+		iter->pos = p;
+
+		/*
+		 * Regardless of what the file header said, we
+		 * definitely know the value of *this* reference. But
+		 * we suppress it if the reference is broken:
+		 */
+		if ((iter->base.flags & REF_ISBROKEN)) {
+			oidclr(&iter->peeled);
+			iter->base.flags &= ~REF_KNOWS_PEELED;
+		} else {
+			iter->base.flags |= REF_KNOWS_PEELED;
+		}
+	} else {
+		oidclr(&iter->peeled);
+	}
+
+	return ITER_OK;
+}
+
+static int packed_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct packed_ref_iterator *iter =
+		(struct packed_ref_iterator *)ref_iterator;
+	int ok;
+
+	while ((ok = next_record(iter)) == ITER_OK) {
+		if (iter->flags & DO_FOR_EACH_PER_WORKTREE_ONLY &&
+		    ref_type(iter->base.refname) != REF_TYPE_PER_WORKTREE)
+			continue;
+
+		if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
+		    !ref_resolves_to_object(iter->base.refname, &iter->oid,
+					    iter->flags))
+			continue;
+
+		return ITER_OK;
+	}
+
+	if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+		ok = ITER_ERROR;
+
+	return ok;
+}
+
+static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	struct packed_ref_iterator *iter =
+		(struct packed_ref_iterator *)ref_iterator;
+
+	if ((iter->base.flags & REF_KNOWS_PEELED)) {
+		oidcpy(peeled, &iter->peeled);
+		return is_null_oid(&iter->peeled) ? -1 : 0;
+	} else if ((iter->base.flags & (REF_ISBROKEN | REF_ISSYMREF))) {
+		return -1;
+	} else {
+		return !!peel_object(iter->oid.hash, peeled->hash);
+	}
+}
+
+static int packed_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct packed_ref_iterator *iter =
+		(struct packed_ref_iterator *)ref_iterator;
+	int ok = ITER_DONE;
+
+	strbuf_release(&iter->refname_buf);
+	release_snapshot(iter->snapshot);
+	base_ref_iterator_free(ref_iterator);
+	return ok;
+}
+
+static struct ref_iterator_vtable packed_ref_iterator_vtable = {
+	packed_ref_iterator_advance,
+	packed_ref_iterator_peel,
+	packed_ref_iterator_abort
+};
+
+static struct ref_iterator *packed_ref_iterator_begin(
+		struct ref_store *ref_store,
+		const char *prefix, unsigned int flags)
+{
+	struct packed_ref_store *refs;
+	struct snapshot *snapshot;
+	const char *start;
+	struct packed_ref_iterator *iter;
+	struct ref_iterator *ref_iterator;
+	unsigned int required_flags = REF_STORE_READ;
+
+	if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN))
+		required_flags |= REF_STORE_ODB;
+	refs = packed_downcast(ref_store, required_flags, "ref_iterator_begin");
+
+	/*
+	 * Note that `get_snapshot()` internally checks whether the
+	 * snapshot is up to date with what is on disk, and re-reads
+	 * it if not.
+	 */
+	snapshot = get_snapshot(refs);
+
+	if (!snapshot->buf)
+		return empty_ref_iterator_begin();
+
+	iter = xcalloc(1, sizeof(*iter));
+	ref_iterator = &iter->base;
+	base_ref_iterator_init(ref_iterator, &packed_ref_iterator_vtable, 1);
+
+	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);
+
+	iter->base.oid = &iter->oid;
+
+	iter->flags = flags;
+
+	if (prefix && *prefix)
+		/* Stop iteration after we've gone *past* prefix: */
+		ref_iterator = prefix_ref_iterator_begin(ref_iterator, prefix, 0);
+
+	return ref_iterator;
+}
+
+/*
+ * Write an entry to the packed-refs file for the specified refname.
+ * If peeled is non-NULL, write it as the entry's peeled value. On
+ * error, return a nonzero value and leave errno set at the value left
+ * by the failing call to `fprintf()`.
+ */
+static int write_packed_entry(FILE *fh, const char *refname,
+			      const unsigned char *sha1,
+			      const unsigned char *peeled)
+{
+	if (fprintf(fh, "%s %s\n", sha1_to_hex(sha1), refname) < 0 ||
+	    (peeled && fprintf(fh, "^%s\n", sha1_to_hex(peeled)) < 0))
+		return -1;
+
+	return 0;
+}
+
+int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err)
+{
+	struct packed_ref_store *refs =
+		packed_downcast(ref_store, REF_STORE_WRITE | REF_STORE_MAIN,
+				"packed_refs_lock");
+	static int timeout_configured = 0;
+	static int timeout_value = 1000;
+
+	if (!timeout_configured) {
+		git_config_get_int("core.packedrefstimeout", &timeout_value);
+		timeout_configured = 1;
+	}
+
+	/*
+	 * Note that we close the lockfile immediately because we
+	 * don't write new content to it, but rather to a separate
+	 * tempfile.
+	 */
+	if (hold_lock_file_for_update_timeout(
+			    &refs->lock,
+			    refs->path,
+			    flags, timeout_value) < 0) {
+		unable_to_lock_message(refs->path, errno, err);
+		return -1;
+	}
+
+	if (close_lock_file_gently(&refs->lock)) {
+		strbuf_addf(err, "unable to close %s: %s", refs->path, strerror(errno));
+		rollback_lock_file(&refs->lock);
+		return -1;
+	}
+
+	/*
+	 * Now that we hold the `packed-refs` lock, make sure that our
+	 * snapshot matches the current version of the file. Normally
+	 * `get_snapshot()` does that for us, but that function
+	 * assumes that when the file is locked, any existing snapshot
+	 * is still valid. We've just locked the file, but it might
+	 * have changed the moment *before* we locked it.
+	 */
+	validate_snapshot(refs);
+
+	/*
+	 * Now make sure that the packed-refs file as it exists in the
+	 * locked state is loaded into the snapshot:
+	 */
+	get_snapshot(refs);
+	return 0;
+}
+
+void packed_refs_unlock(struct ref_store *ref_store)
+{
+	struct packed_ref_store *refs = packed_downcast(
+			ref_store,
+			REF_STORE_READ | REF_STORE_WRITE,
+			"packed_refs_unlock");
+
+	if (!is_lock_file_locked(&refs->lock))
+		die("BUG: packed_refs_unlock() called when not locked");
+	rollback_lock_file(&refs->lock);
+}
+
+int packed_refs_is_locked(struct ref_store *ref_store)
+{
+	struct packed_ref_store *refs = packed_downcast(
+			ref_store,
+			REF_STORE_READ | REF_STORE_WRITE,
+			"packed_refs_is_locked");
+
+	return is_lock_file_locked(&refs->lock);
+}
+
+/*
+ * The packed-refs header line that we write out. Perhaps other traits
+ * will be added later.
+ *
+ * Note that earlier versions of Git used to parse these traits by
+ * looking for " trait " in the line. For this reason, the space after
+ * the colon and the trailing space are required.
+ */
+static const char PACKED_REFS_HEADER[] =
+	"# pack-refs with: peeled fully-peeled sorted \n";
+
+static int packed_init_db(struct ref_store *ref_store, struct strbuf *err)
+{
+	/* Nothing to do. */
+	return 0;
+}
+
+/*
+ * Write the packed refs from the current snapshot to the packed-refs
+ * tempfile, incorporating any changes from `updates`. `updates` must
+ * be a sorted string list whose keys are the refnames and whose util
+ * values are `struct ref_update *`. On error, rollback the tempfile,
+ * write an error message to `err`, and return a nonzero value.
+ *
+ * The packfile must be locked before calling this function and will
+ * remain locked when it is done.
+ */
+static int write_with_updates(struct packed_ref_store *refs,
+			      struct string_list *updates,
+			      struct strbuf *err)
+{
+	struct ref_iterator *iter = NULL;
+	size_t i;
+	int ok;
+	FILE *out;
+	struct strbuf sb = STRBUF_INIT;
+	char *packed_refs_path;
+
+	if (!is_lock_file_locked(&refs->lock))
+		die("BUG: write_with_updates() called while unlocked");
+
+	/*
+	 * If packed-refs is a symlink, we want to overwrite the
+	 * symlinked-to file, not the symlink itself. Also, put the
+	 * staging file next to it:
+	 */
+	packed_refs_path = get_locked_file_path(&refs->lock);
+	strbuf_addf(&sb, "%s.new", packed_refs_path);
+	free(packed_refs_path);
+	refs->tempfile = create_tempfile(sb.buf);
+	if (!refs->tempfile) {
+		strbuf_addf(err, "unable to create file %s: %s",
+			    sb.buf, strerror(errno));
+		strbuf_release(&sb);
+		return -1;
+	}
+	strbuf_release(&sb);
+
+	out = fdopen_tempfile(refs->tempfile, "w");
+	if (!out) {
+		strbuf_addf(err, "unable to fdopen packed-refs tempfile: %s",
+			    strerror(errno));
+		goto error;
+	}
+
+	if (fprintf(out, "%s", PACKED_REFS_HEADER) < 0)
+		goto write_error;
+
+	/*
+	 * We iterate in parallel through the current list of refs and
+	 * the list of updates, processing an entry from at least one
+	 * of the lists each time through the loop. When the current
+	 * list of refs is exhausted, set iter to NULL. When the list
+	 * of updates is exhausted, leave i set to updates->nr.
+	 */
+	iter = packed_ref_iterator_begin(&refs->base, "",
+					 DO_FOR_EACH_INCLUDE_BROKEN);
+	if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+		iter = NULL;
+
+	i = 0;
+
+	while (iter || i < updates->nr) {
+		struct ref_update *update = NULL;
+		int cmp;
+
+		if (i >= updates->nr) {
+			cmp = -1;
+		} else {
+			update = updates->items[i].util;
+
+			if (!iter)
+				cmp = +1;
+			else
+				cmp = strcmp(iter->refname, update->refname);
+		}
+
+		if (!cmp) {
+			/*
+			 * There is both an old value and an update
+			 * for this reference. Check the old value if
+			 * necessary:
+			 */
+			if ((update->flags & REF_HAVE_OLD)) {
+				if (is_null_oid(&update->old_oid)) {
+					strbuf_addf(err, "cannot update ref '%s': "
+						    "reference already exists",
+						    update->refname);
+					goto error;
+				} else if (oidcmp(&update->old_oid, iter->oid)) {
+					strbuf_addf(err, "cannot update ref '%s': "
+						    "is at %s but expected %s",
+						    update->refname,
+						    oid_to_hex(iter->oid),
+						    oid_to_hex(&update->old_oid));
+					goto error;
+				}
+			}
+
+			/* Now figure out what to use for the new value: */
+			if ((update->flags & REF_HAVE_NEW)) {
+				/*
+				 * The update takes precedence. Skip
+				 * the iterator over the unneeded
+				 * value.
+				 */
+				if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+					iter = NULL;
+				cmp = +1;
+			} else {
+				/*
+				 * The update doesn't actually want to
+				 * change anything. We're done with it.
+				 */
+				i++;
+				cmp = -1;
+			}
+		} else if (cmp > 0) {
+			/*
+			 * There is no old value but there is an
+			 * update for this reference. Make sure that
+			 * the update didn't expect an existing value:
+			 */
+			if ((update->flags & REF_HAVE_OLD) &&
+			    !is_null_oid(&update->old_oid)) {
+				strbuf_addf(err, "cannot update ref '%s': "
+					    "reference is missing but expected %s",
+					    update->refname,
+					    oid_to_hex(&update->old_oid));
+				goto error;
+			}
+		}
+
+		if (cmp < 0) {
+			/* Pass the old reference through. */
+
+			struct object_id peeled;
+			int peel_error = ref_iterator_peel(iter, &peeled);
+
+			if (write_packed_entry(out, iter->refname,
+					       iter->oid->hash,
+					       peel_error ? NULL : peeled.hash))
+				goto write_error;
+
+			if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+				iter = NULL;
+		} else if (is_null_oid(&update->new_oid)) {
+			/*
+			 * The update wants to delete the reference,
+			 * and the reference either didn't exist or we
+			 * have already skipped it. So we're done with
+			 * the update (and don't have to write
+			 * anything).
+			 */
+			i++;
+		} else {
+			struct object_id peeled;
+			int peel_error = peel_object(update->new_oid.hash,
+						     peeled.hash);
+
+			if (write_packed_entry(out, update->refname,
+					       update->new_oid.hash,
+					       peel_error ? NULL : peeled.hash))
+				goto write_error;
+
+			i++;
+		}
+	}
+
+	if (ok != ITER_DONE) {
+		strbuf_addstr(err, "unable to write packed-refs file: "
+			      "error iterating over old contents");
+		goto error;
+	}
+
+	if (close_tempfile_gently(refs->tempfile)) {
+		strbuf_addf(err, "error closing file %s: %s",
+			    get_tempfile_path(refs->tempfile),
+			    strerror(errno));
+		strbuf_release(&sb);
+		delete_tempfile(&refs->tempfile);
+		return -1;
+	}
+
+	return 0;
+
+write_error:
+	strbuf_addf(err, "error writing to %s: %s",
+		    get_tempfile_path(refs->tempfile), strerror(errno));
+
+error:
+	if (iter)
+		ref_iterator_abort(iter);
+
+	delete_tempfile(&refs->tempfile);
+	return -1;
+}
+
+struct packed_transaction_backend_data {
+	/* True iff the transaction owns the packed-refs lock. */
+	int own_lock;
+
+	struct string_list updates;
+};
+
+static void packed_transaction_cleanup(struct packed_ref_store *refs,
+				       struct ref_transaction *transaction)
+{
+	struct packed_transaction_backend_data *data = transaction->backend_data;
+
+	if (data) {
+		string_list_clear(&data->updates, 0);
+
+		if (is_tempfile_active(refs->tempfile))
+			delete_tempfile(&refs->tempfile);
+
+		if (data->own_lock && is_lock_file_locked(&refs->lock)) {
+			packed_refs_unlock(&refs->base);
+			data->own_lock = 0;
+		}
+
+		free(data);
+		transaction->backend_data = NULL;
+	}
+
+	transaction->state = REF_TRANSACTION_CLOSED;
+}
+
+static int packed_transaction_prepare(struct ref_store *ref_store,
+				      struct ref_transaction *transaction,
+				      struct strbuf *err)
+{
+	struct packed_ref_store *refs = packed_downcast(
+			ref_store,
+			REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+			"ref_transaction_prepare");
+	struct packed_transaction_backend_data *data;
+	size_t i;
+	int ret = TRANSACTION_GENERIC_ERROR;
+
+	/*
+	 * Note that we *don't* skip transactions with zero updates,
+	 * because such a transaction might be executed for the side
+	 * effect of ensuring that all of the references are peeled or
+	 * ensuring that the `packed-refs` file is sorted. If the
+	 * caller wants to optimize away empty transactions, it should
+	 * do so itself.
+	 */
+
+	data = xcalloc(1, sizeof(*data));
+	string_list_init(&data->updates, 0);
+
+	transaction->backend_data = data;
+
+	/*
+	 * Stick the updates in a string list by refname so that we
+	 * can sort them:
+	 */
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
+		struct string_list_item *item =
+			string_list_append(&data->updates, update->refname);
+
+		/* Store a pointer to update in item->util: */
+		item->util = update;
+	}
+	string_list_sort(&data->updates);
+
+	if (ref_update_reject_duplicates(&data->updates, err))
+		goto failure;
+
+	if (!is_lock_file_locked(&refs->lock)) {
+		if (packed_refs_lock(ref_store, 0, err))
+			goto failure;
+		data->own_lock = 1;
+	}
+
+	if (write_with_updates(refs, &data->updates, err))
+		goto failure;
+
+	transaction->state = REF_TRANSACTION_PREPARED;
+	return 0;
+
+failure:
+	packed_transaction_cleanup(refs, transaction);
+	return ret;
+}
+
+static int packed_transaction_abort(struct ref_store *ref_store,
+				    struct ref_transaction *transaction,
+				    struct strbuf *err)
+{
+	struct packed_ref_store *refs = packed_downcast(
+			ref_store,
+			REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+			"ref_transaction_abort");
+
+	packed_transaction_cleanup(refs, transaction);
+	return 0;
+}
+
+static int packed_transaction_finish(struct ref_store *ref_store,
+				     struct ref_transaction *transaction,
+				     struct strbuf *err)
+{
+	struct packed_ref_store *refs = packed_downcast(
+			ref_store,
+			REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+			"ref_transaction_finish");
+	int ret = TRANSACTION_GENERIC_ERROR;
+	char *packed_refs_path;
+
+	clear_snapshot(refs);
+
+	packed_refs_path = get_locked_file_path(&refs->lock);
+	if (rename_tempfile(&refs->tempfile, packed_refs_path)) {
+		strbuf_addf(err, "error replacing %s: %s",
+			    refs->path, strerror(errno));
+		goto cleanup;
+	}
+
+	ret = 0;
+
+cleanup:
+	free(packed_refs_path);
+	packed_transaction_cleanup(refs, transaction);
+	return ret;
+}
+
+static int packed_initial_transaction_commit(struct ref_store *ref_store,
+					    struct ref_transaction *transaction,
+					    struct strbuf *err)
+{
+	return ref_transaction_commit(transaction, err);
+}
+
+static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
+			     struct string_list *refnames, unsigned int flags)
+{
+	struct packed_ref_store *refs =
+		packed_downcast(ref_store, REF_STORE_WRITE, "delete_refs");
+	struct strbuf err = STRBUF_INIT;
+	struct ref_transaction *transaction;
+	struct string_list_item *item;
+	int ret;
+
+	(void)refs; /* We need the check above, but don't use the variable */
+
+	if (!refnames->nr)
+		return 0;
+
+	/*
+	 * Since we don't check the references' old_oids, the
+	 * individual updates can't fail, so we can pack all of the
+	 * updates into a single transaction.
+	 */
+
+	transaction = ref_store_transaction_begin(ref_store, &err);
+	if (!transaction)
+		return -1;
+
+	for_each_string_list_item(item, refnames) {
+		if (ref_transaction_delete(transaction, item->string, NULL,
+					   flags, msg, &err)) {
+			warning(_("could not delete reference %s: %s"),
+				item->string, err.buf);
+			strbuf_reset(&err);
+		}
+	}
+
+	ret = ref_transaction_commit(transaction, &err);
+
+	if (ret) {
+		if (refnames->nr == 1)
+			error(_("could not delete reference %s: %s"),
+			      refnames->items[0].string, err.buf);
+		else
+			error(_("could not delete references: %s"), err.buf);
+	}
+
+	ref_transaction_free(transaction);
+	strbuf_release(&err);
+	return ret;
+}
+
+static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
+{
+	/*
+	 * Packed refs are already packed. It might be that loose refs
+	 * are packed *into* a packed refs store, but that is done by
+	 * updating the packed references via a transaction.
+	 */
+	return 0;
+}
+
+static int packed_create_symref(struct ref_store *ref_store,
+			       const char *refname, const char *target,
+			       const char *logmsg)
+{
+	die("BUG: packed reference store does not support symrefs");
+}
+
+static int packed_rename_ref(struct ref_store *ref_store,
+			    const char *oldrefname, const char *newrefname,
+			    const char *logmsg)
+{
+	die("BUG: packed reference store does not support renaming references");
+}
+
+static int packed_copy_ref(struct ref_store *ref_store,
+			   const char *oldrefname, const char *newrefname,
+			   const char *logmsg)
+{
+	die("BUG: packed reference store does not support copying references");
+}
+
+static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store)
+{
+	return empty_ref_iterator_begin();
+}
+
+static int packed_for_each_reflog_ent(struct ref_store *ref_store,
+				      const char *refname,
+				      each_reflog_ent_fn fn, void *cb_data)
+{
+	return 0;
+}
+
+static int packed_for_each_reflog_ent_reverse(struct ref_store *ref_store,
+					      const char *refname,
+					      each_reflog_ent_fn fn,
+					      void *cb_data)
+{
+	return 0;
+}
+
+static int packed_reflog_exists(struct ref_store *ref_store,
+			       const char *refname)
+{
+	return 0;
+}
+
+static int packed_create_reflog(struct ref_store *ref_store,
+			       const char *refname, int force_create,
+			       struct strbuf *err)
+{
+	die("BUG: packed reference store does not support reflogs");
+}
+
+static int packed_delete_reflog(struct ref_store *ref_store,
+			       const char *refname)
+{
+	return 0;
+}
+
+static int packed_reflog_expire(struct ref_store *ref_store,
+				const char *refname, const unsigned char *sha1,
+				unsigned int flags,
+				reflog_expiry_prepare_fn prepare_fn,
+				reflog_expiry_should_prune_fn should_prune_fn,
+				reflog_expiry_cleanup_fn cleanup_fn,
+				void *policy_cb_data)
+{
+	return 0;
+}
+
+struct ref_storage_be refs_be_packed = {
+	NULL,
+	"packed",
+	packed_ref_store_create,
+	packed_init_db,
+	packed_transaction_prepare,
+	packed_transaction_finish,
+	packed_transaction_abort,
+	packed_initial_transaction_commit,
+
+	packed_pack_refs,
+	packed_create_symref,
+	packed_delete_refs,
+	packed_rename_ref,
+	packed_copy_ref,
+
+	packed_ref_iterator_begin,
+	packed_read_raw_ref,
+
+	packed_reflog_iterator_begin,
+	packed_for_each_reflog_ent,
+	packed_for_each_reflog_ent_reverse,
+	packed_reflog_exists,
+	packed_create_reflog,
+	packed_delete_reflog,
+	packed_reflog_expire
+};
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
new file mode 100644
index 000000000..61687e408
--- /dev/null
+++ b/refs/packed-backend.h
@@ -0,0 +1,26 @@
+#ifndef REFS_PACKED_BACKEND_H
+#define REFS_PACKED_BACKEND_H
+
+/*
+ * Support for storing references in a `packed-refs` file.
+ *
+ * Note that this backend doesn't check for D/F conflicts, because it
+ * doesn't care about them. But usually it should be wrapped in a
+ * `files_ref_store` that prevents D/F conflicts from being created,
+ * even among packed refs.
+ */
+
+struct ref_store *packed_ref_store_create(const char *path,
+					  unsigned int store_flags);
+
+/*
+ * Lock the packed-refs file for writing. Flags is passed to
+ * hold_lock_file_for_update(). Return 0 on success. On errors, write
+ * an error message to `err` and return a nonzero value.
+ */
+int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err);
+
+void packed_refs_unlock(struct ref_store *ref_store);
+int packed_refs_is_locked(struct ref_store *ref_store);
+
+#endif /* REFS_PACKED_BACKEND_H */
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 76bb723c8..4f850e1b5 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -38,7 +38,6 @@ struct ref_entry *create_ref_entry(const char *refname,
 
 	FLEX_ALLOC_STR(ref, name, refname);
 	oidcpy(&ref->u.value.oid, oid);
-	oidclr(&ref->u.value.peeled);
 	ref->flag = flag;
 	return ref;
 }
@@ -491,49 +490,10 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
 	}
 }
 
-enum peel_status peel_entry(struct ref_entry *entry, int repeel)
-{
-	enum peel_status status;
-
-	if (entry->flag & REF_KNOWS_PEELED) {
-		if (repeel) {
-			entry->flag &= ~REF_KNOWS_PEELED;
-			oidclr(&entry->u.value.peeled);
-		} else {
-			return is_null_oid(&entry->u.value.peeled) ?
-				PEEL_NON_TAG : PEEL_PEELED;
-		}
-	}
-	if (entry->flag & REF_ISBROKEN)
-		return PEEL_BROKEN;
-	if (entry->flag & REF_ISSYMREF)
-		return PEEL_IS_SYMREF;
-
-	status = peel_object(entry->u.value.oid.hash, entry->u.value.peeled.hash);
-	if (status == PEEL_PEELED || status == PEEL_NON_TAG)
-		entry->flag |= REF_KNOWS_PEELED;
-	return status;
-}
-
 static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
 				   struct object_id *peeled)
 {
-	struct cache_ref_iterator *iter =
-		(struct cache_ref_iterator *)ref_iterator;
-	struct cache_ref_iterator_level *level;
-	struct ref_entry *entry;
-
-	level = &iter->levels[iter->levels_nr - 1];
-
-	if (level->index == -1)
-		die("BUG: peel called before advance for cache iterator");
-
-	entry = level->dir->entries[level->index];
-
-	if (peel_entry(entry, 0))
-		return -1;
-	oidcpy(peeled, &entry->u.value.peeled);
-	return 0;
+	return peel_object(ref_iterator->oid->hash, peeled->hash);
 }
 
 static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
@@ -574,7 +534,7 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 
 	iter = xcalloc(1, sizeof(*iter));
 	ref_iterator = &iter->base;
-	base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable);
+	base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable, 1);
 	ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
 
 	iter->levels_nr = 1;
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index 794f000fd..eda65e73e 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -38,14 +38,6 @@ struct ref_value {
 	 * referred to by the last reference in the symlink chain.
 	 */
 	struct object_id oid;
-
-	/*
-	 * If REF_KNOWS_PEELED, then this field holds the peeled value
-	 * of this reference, or null if the reference is known not to
-	 * be peelable.  See the documentation for peel_ref() for an
-	 * exact definition of "peelable".
-	 */
-	struct object_id peeled;
 };
 
 /*
@@ -97,21 +89,14 @@ struct ref_dir {
  * public values; see refs.h.
  */
 
-/*
- * The field ref_entry->u.value.peeled of this value entry contains
- * the correct peeled value for the reference, which might be
- * null_sha1 if the reference is not a tag or if it is broken.
- */
-#define REF_KNOWS_PEELED 0x10
-
 /* ref_entry represents a directory of references */
-#define REF_DIR 0x20
+#define REF_DIR 0x10
 
 /*
  * Entry has not yet been read from disk (used only for REF_DIR
  * entries representing loose references)
  */
-#define REF_INCOMPLETE 0x40
+#define REF_INCOMPLETE 0x20
 
 /*
  * A ref_entry represents either a reference or a "subdirectory" of
@@ -245,23 +230,11 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname);
  * Start iterating over references in `cache`. If `prefix` is
  * specified, only include references whose names start with that
  * prefix. If `prime_dir` is true, then fill any incomplete
- * directories before beginning the iteration.
+ * directories before beginning the iteration. The output is ordered
+ * by refname.
  */
 struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 					      const char *prefix,
 					      int prime_dir);
 
-/*
- * Peel the entry (if possible) and return its new peel_status.  If
- * repeel is true, re-peel the entry even if there is an old peeled
- * value that is already stored in it.
- *
- * It is OK to call this function with a packed reference entry that
- * might be stale and might even refer to an object that has since
- * been garbage-collected.  In such a case, if the entry has
- * REF_KNOWS_PEELED then leave the status unchanged and return
- * PEEL_PEELED or PEEL_NON_TAG; otherwise, return PEEL_INVALID.
- */
-enum peel_status peel_entry(struct ref_entry *entry, int repeel);
-
 #endif /* REFS_REF_CACHE_H */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 192f9f85c..448de4bcc 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -62,6 +62,12 @@
 #define REF_DELETED_LOOSE 0x200
 
 /*
+ * Return the length of time to retry acquiring a loose reference lock
+ * before giving up, in milliseconds:
+ */
+long get_files_ref_lock_timeout_ms(void);
+
+/*
  * Return true iff refname is minimally safe. "Safe" here means that
  * deleting a loose reference by this name will not do any damage, for
  * example by causing a file that is not a reference to be deleted.
@@ -77,6 +83,15 @@
  */
 int refname_is_safe(const char *refname);
 
+/*
+ * Helper function: return true if refname, which has the specified
+ * oid and flags, can be resolved to an object in the database. If the
+ * referred-to object does not exist, emit a warning and return false.
+ */
+int ref_resolves_to_object(const char *refname,
+			   const struct object_id *oid,
+			   unsigned int flags);
+
 enum peel_status {
 	/* object was peeled successfully: */
 	PEEL_PEELED = 0,
@@ -227,6 +242,7 @@ struct ref_transaction {
 	size_t alloc;
 	size_t nr;
 	enum ref_transaction_state state;
+	void *backend_data;
 };
 
 /*
@@ -313,6 +329,13 @@ int refs_rename_ref_available(struct ref_store *refs,
  */
 struct ref_iterator {
 	struct ref_iterator_vtable *vtable;
+
+	/*
+	 * Does this `ref_iterator` iterate over references in order
+	 * by refname?
+	 */
+	unsigned int ordered : 1;
+
 	const char *refname;
 	const struct object_id *oid;
 	unsigned int flags;
@@ -358,7 +381,7 @@ int is_empty_ref_iterator(struct ref_iterator *ref_iterator);
  * which the refname begins with prefix. If trim is non-zero, then
  * trim that many characters off the beginning of each refname. flags
  * can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in
- * the iteration.
+ * the iteration. The output is ordered by refname.
  */
 struct ref_iterator *refs_ref_iterator_begin(
 		struct ref_store *refs,
@@ -384,9 +407,11 @@ typedef enum iterator_selection ref_iterator_select_fn(
  * Iterate over the entries from iter0 and iter1, with the values
  * interleaved as directed by the select function. The iterator takes
  * ownership of iter0 and iter1 and frees them when the iteration is
- * over.
+ * over. A derived class should set `ordered` to 1 or 0 based on
+ * whether it generates its output in order by reference name.
  */
 struct ref_iterator *merge_ref_iterator_begin(
+		int ordered,
 		struct ref_iterator *iter0, struct ref_iterator *iter1,
 		ref_iterator_select_fn *select, void *cb_data);
 
@@ -415,6 +440,8 @@ struct ref_iterator *overlay_ref_iterator_begin(
  * As an convenience to callers, if prefix is the empty string and
  * trim is zero, this function returns iter0 directly, without
  * wrapping it.
+ *
+ * The resulting ref_iterator is ordered if iter0 is.
  */
 struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
 					       const char *prefix,
@@ -425,11 +452,14 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
 /*
  * Base class constructor for ref_iterators. Initialize the
  * ref_iterator part of iter, setting its vtable pointer as specified.
+ * `ordered` should be set to 1 if the iterator will iterate over
+ * references in order by refname; otherwise it should be set to 0.
  * This is meant to be called only by the initializers of derived
  * classes.
  */
 void base_ref_iterator_init(struct ref_iterator *iter,
-			    struct ref_iterator_vtable *vtable);
+			    struct ref_iterator_vtable *vtable,
+			    int ordered);
 
 /*
  * Base class destructor for ref_iterators. Destroy the ref_iterator
@@ -532,8 +562,6 @@ typedef int ref_transaction_commit_fn(struct ref_store *refs,
 				      struct strbuf *err);
 
 typedef int pack_refs_fn(struct ref_store *ref_store, unsigned int flags);
-typedef int peel_ref_fn(struct ref_store *ref_store,
-			const char *refname, unsigned char *sha1);
 typedef int create_symref_fn(struct ref_store *ref_store,
 			     const char *ref_target,
 			     const char *refs_heads_master,
@@ -543,12 +571,16 @@ typedef int delete_refs_fn(struct ref_store *ref_store, const char *msg,
 typedef int rename_ref_fn(struct ref_store *ref_store,
 			  const char *oldref, const char *newref,
 			  const char *logmsg);
+typedef int copy_ref_fn(struct ref_store *ref_store,
+			  const char *oldref, const char *newref,
+			  const char *logmsg);
 
 /*
  * Iterate over the references in `ref_store` whose names start with
  * `prefix`. `prefix` is matched as a literal string, without regard
  * for path separators. If prefix is NULL or the empty string, iterate
- * over all references in `ref_store`.
+ * over all references in `ref_store`. The output is ordered by
+ * refname.
  */
 typedef struct ref_iterator *ref_iterator_begin_fn(
 		struct ref_store *ref_store,
@@ -637,10 +669,10 @@ struct ref_storage_be {
 	ref_transaction_commit_fn *initial_transaction_commit;
 
 	pack_refs_fn *pack_refs;
-	peel_ref_fn *peel_ref;
 	create_symref_fn *create_symref;
 	delete_refs_fn *delete_refs;
 	rename_ref_fn *rename_ref;
+	copy_ref_fn *copy_ref;
 
 	ref_iterator_begin_fn *iterator_begin;
 	read_raw_ref_fn *read_raw_ref;
@@ -655,6 +687,7 @@ struct ref_storage_be {
 };
 
 extern struct ref_storage_be refs_be_files;
+extern struct ref_storage_be refs_be_packed;
 
 /*
  * A representation of the reference store for the main repository or
diff --git a/remote.c b/remote.c
index 60d004392..b220f0dfc 100644
--- a/remote.c
+++ b/remote.c
@@ -134,10 +134,14 @@ struct remotes_hash_key {
 };
 
 static int remotes_hash_cmp(const void *unused_cmp_data,
-			    const struct remote *a,
-			    const struct remote *b,
-			    const struct remotes_hash_key *key)
+			    const void *entry,
+			    const void *entry_or_key,
+			    const void *keydata)
 {
+	const struct remote *a = entry;
+	const struct remote *b = entry_or_key;
+	const struct remotes_hash_key *key = keydata;
+
 	if (key)
 		return strncmp(a->name, key->str, key->len) || a->name[key->len];
 	else
@@ -147,7 +151,7 @@ static int remotes_hash_cmp(const void *unused_cmp_data,
 static inline void init_remotes_hash(void)
 {
 	if (!remotes_hash.cmpfn)
-		hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, NULL, 0);
+		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
 }
 
 static struct remote *make_remote(const char *name, int len)
@@ -462,7 +466,6 @@ static void alias_all_urls(void)
 static void read_config(void)
 {
 	static int loaded;
-	struct object_id oid;
 	int flag;
 
 	if (loaded)
@@ -471,7 +474,7 @@ static void read_config(void)
 
 	current_branch = NULL;
 	if (startup_info->have_repository) {
-		const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
+		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
 		if (head_ref && (flag & REF_ISSYMREF) &&
 		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
 			current_branch = make_branch(head_ref, 0);
@@ -1081,7 +1084,7 @@ static int try_explicit_object_name(const char *name,
 		return 0;
 	}
 
-	if (get_sha1(name, oid.hash))
+	if (get_oid(name, &oid))
 		return -1;
 
 	if (match) {
@@ -1101,10 +1104,9 @@ static struct ref *make_linked_ref(const char *name, struct ref ***tail)
 static char *guess_ref(const char *name, struct ref *peer)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct object_id oid;
 
 	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
-					   oid.hash, NULL);
+					   NULL, NULL);
 	if (!r)
 		return NULL;
 
@@ -1162,12 +1164,11 @@ static int match_explicit(struct ref *src, struct ref *dst,
 		return -1;
 
 	if (!dst_value) {
-		struct object_id oid;
 		int flag;
 
 		dst_value = resolve_ref_unsafe(matched_src->name,
 					       RESOLVE_REF_READING,
-					       oid.hash, &flag);
+					       NULL, &flag);
 		if (!dst_value ||
 		    ((flag & REF_ISSYMREF) &&
 		     !starts_with(dst_value, "refs/heads/")))
@@ -1788,10 +1789,9 @@ const char *branch_get_push(struct branch *branch, struct strbuf *err)
 
 static int ignore_symref_update(const char *refname)
 {
-	struct object_id oid;
 	int flag;
 
-	if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
+	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
 		return 0; /* non-existing refs are OK */
 	return (flag & REF_ISSYMREF);
 }
@@ -2080,7 +2080,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
 				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
 	} else if (!ours && !theirs) {
 		strbuf_addf(sb,
-			_("Your branch is up-to-date with '%s'.\n"),
+			_("Your branch is up to date with '%s'.\n"),
 			base);
 	} else if (!theirs) {
 		strbuf_addf(sb,
@@ -2297,8 +2297,8 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i
 	if (!*colon)
 		entry->use_tracking = 1;
 	else if (!colon[1])
-		hashclr(entry->expect);
-	else if (get_sha1(colon + 1, entry->expect))
+		oidclr(&entry->expect);
+	else if (get_oid(colon + 1, &entry->expect))
 		return error("cannot parse expected object name '%s'", colon + 1);
 	return 0;
 }
@@ -2345,7 +2345,7 @@ static void apply_cas(struct push_cas_option *cas,
 			continue;
 		ref->expect_old_sha1 = 1;
 		if (!entry->use_tracking)
-			hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
+			oidcpy(&ref->old_oid_expect, &entry->expect);
 		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
 			oidclr(&ref->old_oid_expect);
 		return;
diff --git a/remote.h b/remote.h
index 6c28cd3e4..2ecf4c8c7 100644
--- a/remote.h
+++ b/remote.h
@@ -282,7 +282,7 @@ struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fet
 struct push_cas_option {
 	unsigned use_tracking_for_rest:1;
 	struct push_cas {
-		unsigned char expect[20];
+		struct object_id expect;
 		unsigned use_tracking:1;
 		char *refname;
 	} *entry;
diff --git a/repository.c b/repository.c
index edca90740..bb2fae544 100644
--- a/repository.c
+++ b/repository.c
@@ -4,7 +4,9 @@
 #include "submodule-config.h"
 
 /* The main repository */
-static struct repository the_repo;
+static struct repository the_repo = {
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &the_index, 0, 0
+};
 struct repository *the_repository = &the_repo;
 
 static char *git_path_from_env(const char *envvar, const char *git_dir,
@@ -38,11 +40,15 @@ static void repo_setup_env(struct repository *repo)
 
 	repo->different_commondir = find_common_dir(&sb, repo->gitdir,
 						    !repo->ignore_env);
+	free(repo->commondir);
 	repo->commondir = strbuf_detach(&sb, NULL);
+	free(repo->objectdir);
 	repo->objectdir = git_path_from_env(DB_ENVIRONMENT, repo->commondir,
 					    "objects", !repo->ignore_env);
+	free(repo->graft_file);
 	repo->graft_file = git_path_from_env(GRAFT_ENVIRONMENT, repo->commondir,
 					     "info/grafts", !repo->ignore_env);
+	free(repo->index_file);
 	repo->index_file = git_path_from_env(INDEX_ENVIRONMENT, repo->gitdir,
 					     "index", !repo->ignore_env);
 }
@@ -50,16 +56,12 @@ static void repo_setup_env(struct repository *repo)
 void repo_set_gitdir(struct repository *repo, const char *path)
 {
 	const char *gitfile = read_gitfile(path);
+	char *old_gitdir = repo->gitdir;
 
-	/*
-	 * NEEDSWORK: Eventually we want to be able to free gitdir and the rest
-	 * of the environment before reinitializing it again, but we have some
-	 * crazy code paths where we try to set gitdir with the current gitdir
-	 * and we don't want to free gitdir before copying the passed in value.
-	 */
 	repo->gitdir = xstrdup(gitfile ? gitfile : path);
-
 	repo_setup_env(repo);
+
+	free(old_gitdir);
 }
 
 /*
@@ -158,7 +160,7 @@ int repo_submodule_init(struct repository *submodule,
 	struct strbuf worktree = STRBUF_INIT;
 	int ret = 0;
 
-	sub = submodule_from_cache(superproject, null_sha1, path);
+	sub = submodule_from_cache(superproject, &null_oid, path);
 	if (!sub) {
 		ret = -1;
 		goto out;
@@ -198,25 +200,17 @@ out:
 
 void repo_clear(struct repository *repo)
 {
-	free(repo->gitdir);
-	repo->gitdir = NULL;
-	free(repo->commondir);
-	repo->commondir = NULL;
-	free(repo->objectdir);
-	repo->objectdir = NULL;
-	free(repo->graft_file);
-	repo->graft_file = NULL;
-	free(repo->index_file);
-	repo->index_file = NULL;
-	free(repo->worktree);
-	repo->worktree = NULL;
-	free(repo->submodule_prefix);
-	repo->submodule_prefix = NULL;
+	FREE_AND_NULL(repo->gitdir);
+	FREE_AND_NULL(repo->commondir);
+	FREE_AND_NULL(repo->objectdir);
+	FREE_AND_NULL(repo->graft_file);
+	FREE_AND_NULL(repo->index_file);
+	FREE_AND_NULL(repo->worktree);
+	FREE_AND_NULL(repo->submodule_prefix);
 
 	if (repo->config) {
 		git_configset_clear(repo->config);
-		free(repo->config);
-		repo->config = NULL;
+		FREE_AND_NULL(repo->config);
 	}
 
 	if (repo->submodule_cache) {
@@ -226,8 +220,7 @@ void repo_clear(struct repository *repo)
 
 	if (repo->index) {
 		discard_index(repo->index);
-		free(repo->index);
-		repo->index = NULL;
+		FREE_AND_NULL(repo->index);
 	}
 }
 
@@ -235,8 +228,6 @@ int repo_read_index(struct repository *repo)
 {
 	if (!repo->index)
 		repo->index = xcalloc(1, sizeof(*repo->index));
-	else
-		discard_index(repo->index);
 
 	return read_index_from(repo->index, repo->index_file);
 }
diff --git a/repository.h b/repository.h
index 417787f3e..7f5e24a0a 100644
--- a/repository.h
+++ b/repository.h
@@ -92,6 +92,14 @@ extern int repo_submodule_init(struct repository *submodule,
 			       const char *path);
 extern void repo_clear(struct repository *repo);
 
+/*
+ * Populates the repository's index from its index_file, an index struct will
+ * be allocated if needed.
+ *
+ * Return the number of index entries in the populated index or a value less
+ * than zero if an error occured.  If the repository's index has already been
+ * populated then the number of entries will simply be returned.
+ */
 extern int repo_read_index(struct repository *repo);
 
 #endif /* REPOSITORY_H */
diff --git a/rerere.c b/rerere.c
index 70634d456..1ce440f4b 100644
--- a/rerere.c
+++ b/rerere.c
@@ -258,7 +258,7 @@ static int write_rr(struct string_list *rr, int out_fd)
 				    rerere_id_hex(id),
 				    rr->items[i].string, 0);
 
-		if (write_in_full(out_fd, buf.buf, buf.len) != buf.len)
+		if (write_in_full(out_fd, buf.buf, buf.len) < 0)
 			die("unable to write rerere record");
 
 		strbuf_release(&buf);
@@ -1133,14 +1133,14 @@ int rerere_forget(struct pathspec *pathspec)
  * Garbage collection support
  */
 
-static time_t rerere_created_at(struct rerere_id *id)
+static timestamp_t rerere_created_at(struct rerere_id *id)
 {
 	struct stat st;
 
 	return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
 }
 
-static time_t rerere_last_used_at(struct rerere_id *id)
+static timestamp_t rerere_last_used_at(struct rerere_id *id)
 {
 	struct stat st;
 
@@ -1157,11 +1157,11 @@ static void unlink_rr_item(struct rerere_id *id)
 	id->collection->status[id->variant] = 0;
 }
 
-static void prune_one(struct rerere_id *id, time_t now,
-		      int cutoff_resolve, int cutoff_noresolve)
+static void prune_one(struct rerere_id *id,
+		      timestamp_t cutoff_resolve, timestamp_t cutoff_noresolve)
 {
-	time_t then;
-	int cutoff;
+	timestamp_t then;
+	timestamp_t cutoff;
 
 	then = rerere_last_used_at(id);
 	if (then)
@@ -1172,7 +1172,7 @@ static void prune_one(struct rerere_id *id, time_t now,
 			return;
 		cutoff = cutoff_noresolve;
 	}
-	if (then < now - cutoff * 86400)
+	if (then < cutoff)
 		unlink_rr_item(id);
 }
 
@@ -1182,15 +1182,15 @@ void rerere_gc(struct string_list *rr)
 	DIR *dir;
 	struct dirent *e;
 	int i;
-	time_t now = time(NULL);
-	int cutoff_noresolve = 15;
-	int cutoff_resolve = 60;
+	timestamp_t now = time(NULL);
+	timestamp_t cutoff_noresolve = now - 15 * 86400;
+	timestamp_t cutoff_resolve = now - 60 * 86400;
 
 	if (setup_rerere(rr, 0) < 0)
 		return;
 
-	git_config_get_int("gc.rerereresolved", &cutoff_resolve);
-	git_config_get_int("gc.rerereunresolved", &cutoff_noresolve);
+	git_config_get_expiry_in_days("gc.rerereresolved", &cutoff_resolve, now);
+	git_config_get_expiry_in_days("gc.rerereunresolved", &cutoff_noresolve, now);
 	git_config(git_default_config, NULL);
 	dir = opendir(git_path("rr-cache"));
 	if (!dir)
@@ -1211,7 +1211,7 @@ void rerere_gc(struct string_list *rr)
 		for (id.variant = 0, id.collection = rr_dir;
 		     id.variant < id.collection->status_nr;
 		     id.variant++) {
-			prune_one(&id, now, cutoff_resolve, cutoff_noresolve);
+			prune_one(&id, cutoff_resolve, cutoff_noresolve);
 			if (id.collection->status[id.variant])
 				now_empty = 0;
 		}
diff --git a/revision.c b/revision.c
index f032ab2e5..d167223e6 100644
--- a/revision.c
+++ b/revision.c
@@ -19,6 +19,9 @@
 #include "dir.h"
 #include "cache-tree.h"
 #include "bisect.h"
+#include "packfile.h"
+#include "worktree.h"
+#include "argv-array.h"
 
 volatile show_early_output_fn_t show_early_output;
 
@@ -1103,7 +1106,7 @@ static void add_rev_cmdline(struct rev_info *revs,
 			    unsigned flags)
 {
 	struct rev_cmdline_info *info = &revs->cmdline;
-	int nr = info->nr;
+	unsigned int nr = info->nr;
 
 	ALLOC_GROW(info->rev, nr + 1, info->alloc);
 	info->rev[nr].item = item;
@@ -1131,6 +1134,7 @@ struct all_refs_cb {
 	int warned_bad_reflog;
 	struct rev_info *all_revs;
 	const char *name_for_errormsg;
+	struct ref_store *refs;
 };
 
 int ref_excluded(struct string_list *ref_excludes, const char *path)
@@ -1167,6 +1171,7 @@ static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
 	cb->all_revs = revs;
 	cb->all_flags = flags;
 	revs->rev_input_given = 1;
+	cb->refs = NULL;
 }
 
 void clear_ref_exclusion(struct string_list **ref_excludes_p)
@@ -1187,12 +1192,19 @@ void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
 	string_list_append(*ref_excludes_p, exclude);
 }
 
-static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
-		int (*for_each)(const char *, each_ref_fn, void *))
+static void handle_refs(struct ref_store *refs,
+			struct rev_info *revs, unsigned flags,
+			int (*for_each)(struct ref_store *, each_ref_fn, void *))
 {
 	struct all_refs_cb cb;
+
+	if (!refs) {
+		/* this could happen with uninitialized submodules */
+		return;
+	}
+
 	init_all_refs_cb(&cb, revs, flags);
-	for_each(submodule, handle_one_ref, &cb);
+	for_each(refs, handle_one_ref, &cb);
 }
 
 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
@@ -1228,17 +1240,41 @@ static int handle_one_reflog(const char *path, const struct object_id *oid,
 	struct all_refs_cb *cb = cb_data;
 	cb->warned_bad_reflog = 0;
 	cb->name_for_errormsg = path;
-	for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
+	refs_for_each_reflog_ent(cb->refs, path,
+				 handle_one_reflog_ent, cb_data);
 	return 0;
 }
 
+static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
+{
+	struct worktree **worktrees, **p;
+
+	worktrees = get_worktrees(0);
+	for (p = worktrees; *p; p++) {
+		struct worktree *wt = *p;
+
+		if (wt->is_current)
+			continue;
+
+		cb->refs = get_worktree_ref_store(wt);
+		refs_for_each_reflog(cb->refs,
+				     handle_one_reflog,
+				     cb);
+	}
+	free_worktrees(worktrees);
+}
+
 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
 {
 	struct all_refs_cb cb;
 
 	cb.all_revs = revs;
 	cb.all_flags = flags;
+	cb.refs = get_main_ref_store();
 	for_each_reflog(handle_one_reflog, &cb);
+
+	if (!revs->single_worktree)
+		add_other_reflogs_to_pending(&cb);
 }
 
 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
@@ -1262,13 +1298,13 @@ static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
 
 }
 
-void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
+static void do_add_index_objects_to_pending(struct rev_info *revs,
+					    struct index_state *istate)
 {
 	int i;
 
-	read_cache();
-	for (i = 0; i < active_nr; i++) {
-		struct cache_entry *ce = active_cache[i];
+	for (i = 0; i < istate->cache_nr; i++) {
+		struct cache_entry *ce = istate->cache[i];
 		struct blob *blob;
 
 		if (S_ISGITLINK(ce->ce_mode))
@@ -1281,13 +1317,39 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
 					     ce->ce_mode, ce->name);
 	}
 
-	if (active_cache_tree) {
+	if (istate->cache_tree) {
 		struct strbuf path = STRBUF_INIT;
-		add_cache_tree(active_cache_tree, revs, &path);
+		add_cache_tree(istate->cache_tree, revs, &path);
 		strbuf_release(&path);
 	}
 }
 
+void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
+{
+	struct worktree **worktrees, **p;
+
+	read_cache();
+	do_add_index_objects_to_pending(revs, &the_index);
+
+	if (revs->single_worktree)
+		return;
+
+	worktrees = get_worktrees(0);
+	for (p = worktrees; *p; p++) {
+		struct worktree *wt = *p;
+		struct index_state istate = { NULL };
+
+		if (wt->is_current)
+			continue; /* current index already taken care of */
+
+		if (read_index_from(&istate,
+				    worktree_git_path(wt, "index")) > 0)
+			do_add_index_objects_to_pending(revs, &istate);
+		discard_index(&istate);
+	}
+	free_worktrees(worktrees);
+}
+
 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
 			    int exclude_parent)
 {
@@ -1302,7 +1364,7 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
 		flags ^= UNINTERESTING | BOTTOM;
 		arg++;
 	}
-	if (get_sha1_committish(arg, oid.hash))
+	if (get_oid_committish(arg, &oid))
 		return 0;
 	while (1) {
 		it = get_reference(revs, arg, &oid, 0);
@@ -1451,7 +1513,7 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
 	unsigned int a_flags, b_flags;
 	int symmetric = 0;
 	unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
-	unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
+	unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
 
 	a_name = arg;
 	if (!*a_name)
@@ -1465,8 +1527,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
 	if (!*b_name)
 		b_name = "HEAD";
 
-	if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
-	    get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
+	if (get_oid_with_context(a_name, oc_flags, &a_oid, a_oc) ||
+	    get_oid_with_context(b_name, oc_flags, &b_oid, b_oc))
 		return -1;
 
 	if (!cant_be_filename) {
@@ -1547,7 +1609,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
 	int local_flags;
 	const char *arg = arg_;
 	int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
-	unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
+	unsigned get_sha1_flags = GET_OID_RECORD_PATH;
 
 	flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
 
@@ -1598,9 +1660,9 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
 	}
 
 	if (revarg_opt & REVARG_COMMITTISH)
-		get_sha1_flags |= GET_SHA1_COMMITTISH;
+		get_sha1_flags |= GET_OID_COMMITTISH;
 
-	if (get_sha1_with_context(arg, get_sha1_flags, oid.hash, &oc))
+	if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
 		return revs->ignore_missing ? 0 : -1;
 	if (!cant_be_filename)
 		verify_non_filename(revs->prefix, arg);
@@ -1611,31 +1673,15 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
 	return 0;
 }
 
-struct cmdline_pathspec {
-	int alloc;
-	int nr;
-	const char **path;
-};
-
-static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
-{
-	while (*av) {
-		ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
-		prune->path[prune->nr++] = *(av++);
-	}
-}
-
 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
-				     struct cmdline_pathspec *prune)
+				     struct argv_array *prune)
 {
-	while (strbuf_getline(sb, stdin) != EOF) {
-		ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
-		prune->path[prune->nr++] = xstrdup(sb->buf);
-	}
+	while (strbuf_getline(sb, stdin) != EOF)
+		argv_array_push(prune, sb->buf);
 }
 
 static void read_revisions_from_stdin(struct rev_info *revs,
-				      struct cmdline_pathspec *prune)
+				      struct argv_array *prune)
 {
 	struct strbuf sb;
 	int seen_dashdash = 0;
@@ -2068,23 +2114,25 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 	ctx->argc -= n;
 }
 
-static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
+static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
+			       void *cb_data, const char *term)
+{
 	struct strbuf bisect_refs = STRBUF_INIT;
 	int status;
 	strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
-	status = for_each_fullref_in_submodule(submodule, bisect_refs.buf, fn, cb_data, 0);
+	status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
 	strbuf_release(&bisect_refs);
 	return status;
 }
 
-static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
-	return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
+	return for_each_bisect_ref(refs, fn, cb_data, term_bad);
 }
 
-static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
-	return for_each_bisect_ref(submodule, fn, cb_data, term_good);
+	return for_each_bisect_ref(refs, fn, cb_data, term_good);
 }
 
 static int handle_revision_pseudo_opt(const char *submodule,
@@ -2093,8 +2141,22 @@ static int handle_revision_pseudo_opt(const char *submodule,
 {
 	const char *arg = argv[0];
 	const char *optarg;
+	struct ref_store *refs;
 	int argcount;
 
+	if (submodule) {
+		/*
+		 * We need some something like get_submodule_worktrees()
+		 * before we can go through all worktrees of a submodule,
+		 * .e.g with adding all HEADs from --all, which is not
+		 * supported right now, so stick to single worktree.
+		 */
+		if (!revs->single_worktree)
+			die("BUG: --single-worktree cannot be used together with submodule");
+		refs = get_submodule_ref_store(submodule);
+	} else
+		refs = get_main_ref_store();
+
 	/*
 	 * NOTE!
 	 *
@@ -2106,22 +2168,29 @@ static int handle_revision_pseudo_opt(const char *submodule,
 	 * register it in the list at the top of handle_revision_opt.
 	 */
 	if (!strcmp(arg, "--all")) {
-		handle_refs(submodule, revs, *flags, for_each_ref_submodule);
-		handle_refs(submodule, revs, *flags, head_ref_submodule);
+		handle_refs(refs, revs, *flags, refs_for_each_ref);
+		handle_refs(refs, revs, *flags, refs_head_ref);
+		if (!revs->single_worktree) {
+			struct all_refs_cb cb;
+
+			init_all_refs_cb(&cb, revs, *flags);
+			other_head_refs(handle_one_ref, &cb);
+		}
 		clear_ref_exclusion(&revs->ref_excludes);
 	} else if (!strcmp(arg, "--branches")) {
-		handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
+		handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
 		clear_ref_exclusion(&revs->ref_excludes);
 	} else if (!strcmp(arg, "--bisect")) {
 		read_bisect_terms(&term_bad, &term_good);
-		handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
-		handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
+		handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
+		handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
+			    for_each_good_bisect_ref);
 		revs->bisect = 1;
 	} else if (!strcmp(arg, "--tags")) {
-		handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
+		handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
 		clear_ref_exclusion(&revs->ref_excludes);
 	} else if (!strcmp(arg, "--remotes")) {
-		handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
+		handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
 		clear_ref_exclusion(&revs->ref_excludes);
 	} else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
 		struct all_refs_cb cb;
@@ -2168,6 +2237,8 @@ static int handle_revision_pseudo_opt(const char *submodule,
 			return error("invalid argument to --no-walk");
 	} else if (!strcmp(arg, "--do-walk")) {
 		revs->no_walk = 0;
+	} else if (!strcmp(arg, "--single-worktree")) {
+		revs->single_worktree = 1;
 	} else {
 		return 0;
 	}
@@ -2177,11 +2248,10 @@ static int handle_revision_pseudo_opt(const char *submodule,
 
 static void NORETURN diagnose_missing_default(const char *def)
 {
-	unsigned char sha1[20];
 	int flags;
 	const char *refname;
 
-	refname = resolve_ref_unsafe(def, 0, sha1, &flags);
+	refname = resolve_ref_unsafe(def, 0, NULL, &flags);
 	if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
 		die(_("your current branch appears to be broken"));
 
@@ -2200,10 +2270,9 @@ static void NORETURN diagnose_missing_default(const char *def)
 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
 {
 	int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
-	struct cmdline_pathspec prune_data;
+	struct argv_array prune_data = ARGV_ARRAY_INIT;
 	const char *submodule = NULL;
 
-	memset(&prune_data, 0, sizeof(prune_data));
 	if (opt)
 		submodule = opt->submodule;
 
@@ -2219,7 +2288,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			argv[i] = NULL;
 			argc = i;
 			if (argv[i + 1])
-				append_prune_data(&prune_data, argv + i + 1);
+				argv_array_pushv(&prune_data, argv + i + 1);
 			seen_dashdash = 1;
 			break;
 		}
@@ -2280,14 +2349,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			for (j = i; j < argc; j++)
 				verify_filename(revs->prefix, argv[j], j == i);
 
-			append_prune_data(&prune_data, argv + i);
+			argv_array_pushv(&prune_data, argv + i);
 			break;
 		}
 		else
 			got_rev_arg = 1;
 	}
 
-	if (prune_data.nr) {
+	if (prune_data.argc) {
 		/*
 		 * If we need to introduce the magic "a lone ':' means no
 		 * pathspec whatsoever", here is the place to do so.
@@ -2302,11 +2371,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		 *	call init_pathspec() to set revs->prune_data here.
 		 * }
 		 */
-		ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
-		prune_data.path[prune_data.nr++] = NULL;
 		parse_pathspec(&revs->prune_data, 0, 0,
-			       revs->prefix, prune_data.path);
+			       revs->prefix, prune_data.argv);
 	}
+	argv_array_clear(&prune_data);
 
 	if (revs->def == NULL)
 		revs->def = opt ? opt->def : NULL;
@@ -2318,7 +2386,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		struct object_id oid;
 		struct object *object;
 		struct object_context oc;
-		if (get_sha1_with_context(revs->def, 0, oid.hash, &oc))
+		if (get_oid_with_context(revs->def, 0, &oid, &oc))
 			diagnose_missing_default(revs->def);
 		object = get_reference(revs, revs->def, &oid, 0);
 		add_pending_object_with_mode(revs, object, revs->def, oc.mode);
diff --git a/revision.h b/revision.h
index bc18487d6..54761200a 100644
--- a/revision.h
+++ b/revision.h
@@ -96,6 +96,7 @@ struct rev_info {
 			topo_order:1,
 			simplify_merges:1,
 			simplify_by_decoration:1,
+			single_worktree:1,
 			tag_objects:1,
 			tree_objects:1,
 			blob_objects:1,
@@ -149,6 +150,17 @@ struct rev_info {
 			date_mode_explicit:1,
 			preserve_subject:1;
 	unsigned int	disable_stdin:1;
+	/*
+	 * Set `leak_pending` to prevent `prepare_revision_walk()` from clearing
+	 * the array of pending objects (`pending`). It will still forget about
+	 * the array and its entries, so they really are leaked. This can be
+	 * useful if the `struct object_array` `pending` is copied before
+	 * calling `prepare_revision_walk()`. By setting `leak_pending`, you
+	 * effectively claim ownership of the old array, so you should most
+	 * likely call `object_array_clear(&pending_copy)` once you are done.
+	 * Observe that this is about ownership of the array and its entries,
+	 * not the commits referenced by those entries.
+	 */
 	unsigned int	leak_pending:1;
 	/* --show-linear-break */
 	unsigned int	track_linear:1,
diff --git a/send-pack.c b/send-pack.c
index 11d6f3d98..a8cc6b266 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -492,9 +492,12 @@ int send_pack(struct send_pack_args *args,
 			 * we were to send it and we're trying to send the refs
 			 * atomically, abort the whole operation.
 			 */
-			if (use_atomic)
+			if (use_atomic) {
+				strbuf_release(&req_buf);
+				strbuf_release(&cap_buf);
 				return atomic_push_failure(args, remote_refs, ref);
-			/* Fallthrough for non atomic case. */
+			}
+			/* else fallthrough */
 		default:
 			continue;
 		}
diff --git a/sequencer.c b/sequencer.c
index e0e66b987..f2a10cc4f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -20,6 +20,7 @@
 #include "trailer.h"
 #include "log-tree.h"
 #include "wt-status.h"
+#include "hashmap.h"
 
 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
 
@@ -203,7 +204,7 @@ int sequencer_remove_state(struct replay_opts *opts)
 		free(opts->xopts[i]);
 	free(opts->xopts);
 
-	strbuf_addf(&dir, "%s", get_dir(opts));
+	strbuf_addstr(&dir, get_dir(opts));
 	remove_dir_recursively(&dir, 0);
 	strbuf_release(&dir);
 
@@ -692,7 +693,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
 
 static int is_original_commit_empty(struct commit *commit)
 {
-	const unsigned char *ptree_sha1;
+	const struct object_id *ptree_oid;
 
 	if (parse_commit(commit))
 		return error(_("could not parse commit %s\n"),
@@ -702,12 +703,12 @@ static int is_original_commit_empty(struct commit *commit)
 		if (parse_commit(parent))
 			return error(_("could not parse parent commit %s\n"),
 				oid_to_hex(&parent->object.oid));
-		ptree_sha1 = parent->tree->object.oid.hash;
+		ptree_oid = &parent->tree->object.oid;
 	} else {
-		ptree_sha1 = EMPTY_TREE_SHA1_BIN; /* commit is root */
+		ptree_oid = &empty_tree_oid; /* commit is root */
 	}
 
-	return !hashcmp(ptree_sha1, commit->tree->object.oid.hash);
+	return !oidcmp(ptree_oid, &commit->tree->object.oid);
 }
 
 /*
@@ -897,18 +898,18 @@ static int update_squash_messages(enum todo_command command,
 
 static void flush_rewritten_pending(void) {
 	struct strbuf buf = STRBUF_INIT;
-	unsigned char newsha1[20];
+	struct object_id newoid;
 	FILE *out;
 
-	if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), 82) > 0 &&
-	    !get_sha1("HEAD", newsha1) &&
+	if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), (GIT_MAX_HEXSZ + 1) * 2) > 0 &&
+	    !get_oid("HEAD", &newoid) &&
 	    (out = fopen_or_warn(rebase_path_rewritten_list(), "a"))) {
 		char *bol = buf.buf, *eol;
 
 		while (*bol) {
 			eol = strchrnul(bol, '\n');
 			fprintf(out, "%.*s %s\n", (int)(eol - bol),
-					bol, sha1_to_hex(newsha1));
+					bol, oid_to_hex(&newoid));
 			if (!*eol)
 				break;
 			bol = eol + 1;
@@ -1565,6 +1566,7 @@ static int save_head(const char *head)
 	static struct lock_file head_lock;
 	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) {
@@ -1572,7 +1574,9 @@ static int save_head(const char *head)
 		return error_errno(_("could not lock HEAD"));
 	}
 	strbuf_addf(&buf, "%s\n", head);
-	if (write_in_full(fd, buf.buf, buf.len) < 0) {
+	written = write_in_full(fd, buf.buf, buf.len);
+	strbuf_release(&buf);
+	if (written < 0) {
 		rollback_lock_file(&head_lock);
 		return error_errno(_("could not write to '%s'"),
 				   git_path_head_file());
@@ -1608,36 +1612,37 @@ static int rollback_is_safe(void)
 	return !oidcmp(&actual_head, &expected_head);
 }
 
-static int reset_for_rollback(const unsigned char *sha1)
+static int reset_for_rollback(const struct object_id *oid)
 {
 	const char *argv[4];	/* reset --merge <arg> + NULL */
 
 	argv[0] = "reset";
 	argv[1] = "--merge";
-	argv[2] = sha1_to_hex(sha1);
+	argv[2] = oid_to_hex(oid);
 	argv[3] = NULL;
 	return run_command_v_opt(argv, RUN_GIT_CMD);
 }
 
 static int rollback_single_pick(void)
 {
-	unsigned char head_sha1[20];
+	struct object_id head_oid;
 
 	if (!file_exists(git_path_cherry_pick_head()) &&
 	    !file_exists(git_path_revert_head()))
 		return error(_("no cherry-pick or revert in progress"));
-	if (read_ref_full("HEAD", 0, head_sha1, NULL))
+	if (read_ref_full("HEAD", 0, head_oid.hash, NULL))
 		return error(_("cannot resolve HEAD"));
-	if (is_null_sha1(head_sha1))
+	if (is_null_oid(&head_oid))
 		return error(_("cannot abort from a branch yet to be born"));
-	return reset_for_rollback(head_sha1);
+	return reset_for_rollback(&head_oid);
 }
 
 int sequencer_rollback(struct replay_opts *opts)
 {
 	FILE *f;
-	unsigned char sha1[20];
+	struct object_id oid;
 	struct strbuf buf = STRBUF_INIT;
+	const char *p;
 
 	f = fopen(git_path_head_file(), "r");
 	if (!f && errno == ENOENT) {
@@ -1657,12 +1662,12 @@ int sequencer_rollback(struct replay_opts *opts)
 		goto fail;
 	}
 	fclose(f);
-	if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
+	if (parse_oid_hex(buf.buf, &oid, &p) || *p != '\0') {
 		error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
 			git_path_head_file());
 		goto fail;
 	}
-	if (is_null_sha1(sha1)) {
+	if (is_null_oid(&oid)) {
 		error(_("cannot abort from a branch yet to be born"));
 		goto fail;
 	}
@@ -1672,7 +1677,7 @@ int sequencer_rollback(struct replay_opts *opts)
 		warning(_("You seem to have moved HEAD. "
 			  "Not rewinding, check your HEAD!"));
 	} else
-	if (reset_for_rollback(sha1))
+	if (reset_for_rollback(&oid))
 		goto fail;
 	strbuf_release(&buf);
 	return sequencer_remove_state(opts);
@@ -1806,13 +1811,13 @@ static int make_patch(struct commit *commit, struct replay_opts *opts)
 
 static int intend_to_amend(void)
 {
-	unsigned char head[20];
+	struct object_id head;
 	char *p;
 
-	if (get_sha1("HEAD", head))
+	if (get_oid("HEAD", &head))
 		return error(_("cannot read HEAD"));
 
-	p = sha1_to_hex(head);
+	p = oid_to_hex(&head);
 	return write_message(p, strlen(p), rebase_path_amend(), 1);
 }
 
@@ -2097,10 +2102,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
 		if (read_oneliner(&head_ref, rebase_path_head_name(), 0) &&
 				starts_with(head_ref.buf, "refs/")) {
 			const char *msg;
-			unsigned char head[20], orig[20];
+			struct object_id head, orig;
 			int res;
 
-			if (get_sha1("HEAD", head)) {
+			if (get_oid("HEAD", &head)) {
 				res = error(_("cannot read HEAD"));
 cleanup_head_ref:
 				strbuf_release(&head_ref);
@@ -2108,7 +2113,7 @@ cleanup_head_ref:
 				return res;
 			}
 			if (!read_oneliner(&buf, rebase_path_orig_head(), 0) ||
-					get_sha1_hex(buf.buf, orig)) {
+					get_oid_hex(buf.buf, &orig)) {
 				res = error(_("could not read orig-head"));
 				goto cleanup_head_ref;
 			}
@@ -2119,7 +2124,7 @@ cleanup_head_ref:
 			}
 			msg = reflog_message(opts, "finish", "%s onto %s",
 				head_ref.buf, buf.buf);
-			if (update_ref(msg, head_ref.buf, head, orig,
+			if (update_ref(msg, head_ref.buf, head.hash, orig.hash,
 					REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) {
 				res = error(_("could not update %s"),
 					head_ref.buf);
@@ -2147,8 +2152,8 @@ cleanup_head_ref:
 			log_tree_opt.disable_stdin = 1;
 
 			if (read_oneliner(&buf, rebase_path_orig_head(), 0) &&
-			    !get_sha1(buf.buf, orig.hash) &&
-			    !get_sha1("HEAD", head.hash)) {
+			    !get_oid(buf.buf, &orig) &&
+			    !get_oid("HEAD", &head)) {
 				diff_tree_oid(&orig, &head, "",
 					      &log_tree_opt.diffopt);
 				log_tree_diff_flush(&log_tree_opt);
@@ -2223,16 +2228,16 @@ static int commit_staged_changes(struct replay_opts *opts)
 
 	if (file_exists(rebase_path_amend())) {
 		struct strbuf rev = STRBUF_INIT;
-		unsigned char head[20], to_amend[20];
+		struct object_id head, to_amend;
 
-		if (get_sha1("HEAD", head))
+		if (get_oid("HEAD", &head))
 			return error(_("cannot amend non-existing commit"));
 		if (!read_oneliner(&rev, rebase_path_amend(), 0))
 			return error(_("invalid file: '%s'"), rebase_path_amend());
-		if (get_sha1_hex(rev.buf, to_amend))
+		if (get_oid_hex(rev.buf, &to_amend))
 			return error(_("invalid contents: '%s'"),
 				rebase_path_amend());
-		if (hashcmp(head, to_amend))
+		if (oidcmp(&head, &to_amend))
 			return error(_("\nYou have uncommitted changes in your "
 				       "working tree. Please, commit them\n"
 				       "first and then run 'git rebase "
@@ -2284,7 +2289,7 @@ int sequencer_continue(struct replay_opts *opts)
 		struct object_id oid;
 
 		if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
-		    !get_sha1_committish(buf.buf, oid.hash))
+		    !get_oid_committish(buf.buf, &oid))
 			record_in_rewritten(&oid, peek_command(&todo_list, 0));
 		strbuf_release(&buf);
 	}
@@ -2431,3 +2436,533 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
 
 	strbuf_release(&sob);
 }
+
+int sequencer_make_script(int keep_empty, FILE *out,
+		int argc, const char **argv)
+{
+	char *format = NULL;
+	struct pretty_print_context pp = {0};
+	struct strbuf buf = STRBUF_INIT;
+	struct rev_info revs;
+	struct commit *commit;
+
+	init_revisions(&revs, NULL);
+	revs.verbose_header = 1;
+	revs.max_parents = 1;
+	revs.cherry_pick = 1;
+	revs.limited = 1;
+	revs.reverse = 1;
+	revs.right_only = 1;
+	revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
+	revs.topo_order = 1;
+
+	revs.pretty_given = 1;
+	git_config_get_string("rebase.instructionFormat", &format);
+	if (!format || !*format) {
+		free(format);
+		format = xstrdup("%s");
+	}
+	get_commit_format(format, &revs);
+	free(format);
+	pp.fmt = revs.commit_format;
+	pp.output_encoding = get_log_output_encoding();
+
+	if (setup_revisions(argc, argv, &revs, NULL) > 1)
+		return error(_("make_script: unhandled options"));
+
+	if (prepare_revision_walk(&revs) < 0)
+		return error(_("make_script: error preparing revisions"));
+
+	while ((commit = get_revision(&revs))) {
+		strbuf_reset(&buf);
+		if (!keep_empty && is_original_commit_empty(commit))
+			strbuf_addf(&buf, "%c ", comment_line_char);
+		strbuf_addf(&buf, "pick %s ", oid_to_hex(&commit->object.oid));
+		pretty_print_commit(&pp, commit, &buf);
+		strbuf_addch(&buf, '\n');
+		fputs(buf.buf, out);
+	}
+	strbuf_release(&buf);
+	return 0;
+}
+
+
+int transform_todo_ids(int shorten_ids)
+{
+	const char *todo_file = rebase_path_todo();
+	struct todo_list todo_list = TODO_LIST_INIT;
+	int fd, res, i;
+	FILE *out;
+
+	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);
+
+	res = parse_insn_buffer(todo_list.buf.buf, &todo_list);
+	if (res) {
+		todo_list_release(&todo_list);
+		return error(_("unusable todo list: '%s'"), todo_file);
+	}
+
+	out = fopen(todo_file, "w");
+	if (!out) {
+		todo_list_release(&todo_list);
+		return error(_("unable to open '%s' for writing"), todo_file);
+	}
+	for (i = 0; i < todo_list.nr; i++) {
+		struct todo_item *item = todo_list.items + i;
+		int bol = item->offset_in_buf;
+		const char *p = todo_list.buf.buf + bol;
+		int eol = i + 1 < todo_list.nr ?
+			todo_list.items[i + 1].offset_in_buf :
+			todo_list.buf.len;
+
+		if (item->command >= TODO_EXEC && item->command != TODO_DROP)
+			fwrite(p, eol - bol, 1, out);
+		else {
+			const char *id = shorten_ids ?
+				short_commit_name(item->commit) :
+				oid_to_hex(&item->commit->object.oid);
+			int len;
+
+			p += strspn(p, " \t"); /* left-trim command */
+			len = strcspn(p, " \t"); /* length of command */
+
+			fprintf(out, "%.*s %s %.*s\n",
+				len, p, id, item->arg_len, item->arg);
+		}
+	}
+	fclose(out);
+	todo_list_release(&todo_list);
+	return 0;
+}
+
+enum check_level {
+	CHECK_IGNORE = 0, CHECK_WARN, CHECK_ERROR
+};
+
+static enum check_level get_missing_commit_check_level(void)
+{
+	const char *value;
+
+	if (git_config_get_value("rebase.missingcommitscheck", &value) ||
+			!strcasecmp("ignore", value))
+		return CHECK_IGNORE;
+	if (!strcasecmp("warn", value))
+		return CHECK_WARN;
+	if (!strcasecmp("error", value))
+		return CHECK_ERROR;
+	warning(_("unrecognized setting %s for option "
+		  "rebase.missingCommitsCheck. Ignoring."), value);
+	return CHECK_IGNORE;
+}
+
+/*
+ * Check if the user dropped some commits by mistake
+ * Behaviour determined by rebase.missingCommitsCheck.
+ * Check if there is an unrecognized command or a
+ * bad SHA-1 in a command.
+ */
+int check_todo_list(void)
+{
+	enum check_level check_level = get_missing_commit_check_level();
+	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;
+
+	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);
+		goto leave_check;
+	}
+	close(fd);
+	advise_to_edit_todo = res =
+		parse_insn_buffer(todo_list.buf.buf, &todo_list);
+
+	if (res || check_level == CHECK_IGNORE)
+		goto leave_check;
+
+	/* Mark the commits in git-rebase-todo as seen */
+	for (i = 0; i < todo_list.nr; i++) {
+		struct commit *commit = todo_list.items[i].commit;
+		if (commit)
+			commit->util = (void *)1;
+	}
+
+	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);
+		goto leave_check;
+	}
+	close(fd);
+	strbuf_release(&todo_file);
+	res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list);
+
+	/* Find commits in git-rebase-todo.backup yet unseen */
+	for (i = todo_list.nr - 1; i >= 0; i--) {
+		struct todo_item *item = todo_list.items + i;
+		struct commit *commit = item->commit;
+		if (commit && !commit->util) {
+			strbuf_addf(&missing, " - %s %.*s\n",
+				    short_commit_name(commit),
+				    item->arg_len, item->arg);
+			commit->util = (void *)1;
+		}
+	}
+
+	/* Warn about missing commits */
+	if (!missing.len)
+		goto leave_check;
+
+	if (check_level == CHECK_ERROR)
+		advise_to_edit_todo = res = 1;
+
+	fprintf(stderr,
+		_("Warning: some commits may have been dropped accidentally.\n"
+		"Dropped commits (newer to older):\n"));
+
+	/* Make the list user-friendly and display */
+	fputs(missing.buf, stderr);
+	strbuf_release(&missing);
+
+	fprintf(stderr, _("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"
+		"The possible behaviours are: ignore, warn, error.\n\n"));
+
+leave_check:
+	strbuf_release(&todo_file);
+	todo_list_release(&todo_list);
+
+	if (advise_to_edit_todo)
+		fprintf(stderr,
+			_("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"));
+
+	return res;
+}
+
+/* skip picking commits whose parents are unchanged */
+int skip_unnecessary_picks(void)
+{
+	const char *todo_file = rebase_path_todo();
+	struct strbuf buf = STRBUF_INIT;
+	struct todo_list todo_list = TODO_LIST_INIT;
+	struct object_id onto_oid, *oid = &onto_oid, *parent_oid;
+	int fd, i;
+
+	if (!read_oneliner(&buf, rebase_path_onto(), 0))
+		return error(_("could not read 'onto'"));
+	if (get_oid(buf.buf, &onto_oid)) {
+		strbuf_release(&buf);
+		return error(_("need a HEAD to fixup"));
+	}
+	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 (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
+		todo_list_release(&todo_list);
+		return -1;
+	}
+
+	for (i = 0; i < todo_list.nr; i++) {
+		struct todo_item *item = todo_list.items + i;
+
+		if (item->command >= TODO_NOOP)
+			continue;
+		if (item->command != TODO_PICK)
+			break;
+		if (parse_commit(item->commit)) {
+			todo_list_release(&todo_list);
+			return error(_("could not parse commit '%s'"),
+				oid_to_hex(&item->commit->object.oid));
+		}
+		if (!item->commit->parents)
+			break; /* root commit */
+		if (item->commit->parents->next)
+			break; /* merge commit */
+		parent_oid = &item->commit->parents->item->object.oid;
+		if (hashcmp(parent_oid->hash, oid->hash))
+			break;
+		oid = &item->commit->object.oid;
+	}
+	if (i > 0) {
+		int offset = i < todo_list.nr ?
+			todo_list.items[i].offset_in_buf : todo_list.buf.len;
+		const char *done_path = rebase_path_done();
+
+		fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
+		if (fd < 0) {
+			error_errno(_("could not open '%s' for writing"),
+				    done_path);
+			todo_list_release(&todo_list);
+			return -1;
+		}
+		if (write_in_full(fd, todo_list.buf.buf, offset) < 0) {
+			error_errno(_("could not write to '%s'"), done_path);
+			todo_list_release(&todo_list);
+			close(fd);
+			return -1;
+		}
+		close(fd);
+
+		fd = open(rebase_path_todo(), O_WRONLY, 0666);
+		if (fd < 0) {
+			error_errno(_("could not open '%s' for writing"),
+				    rebase_path_todo());
+			todo_list_release(&todo_list);
+			return -1;
+		}
+		if (write_in_full(fd, todo_list.buf.buf + offset,
+				todo_list.buf.len - offset) < 0) {
+			error_errno(_("could not write to '%s'"),
+				    rebase_path_todo());
+			close(fd);
+			todo_list_release(&todo_list);
+			return -1;
+		}
+		if (ftruncate(fd, todo_list.buf.len - offset) < 0) {
+			error_errno(_("could not truncate '%s'"),
+				    rebase_path_todo());
+			todo_list_release(&todo_list);
+			close(fd);
+			return -1;
+		}
+		close(fd);
+
+		todo_list.current = i;
+		if (is_fixup(peek_command(&todo_list, 0)))
+			record_in_rewritten(oid, peek_command(&todo_list, 0));
+	}
+
+	todo_list_release(&todo_list);
+	printf("%s\n", oid_to_hex(oid));
+
+	return 0;
+}
+
+struct subject2item_entry {
+	struct hashmap_entry entry;
+	int i;
+	char subject[FLEX_ARRAY];
+};
+
+static int subject2item_cmp(const void *fndata,
+			    const struct subject2item_entry *a,
+			    const struct subject2item_entry *b, const void *key)
+{
+	return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject);
+}
+
+/*
+ * Rearrange the todo list that has both "pick commit-id msg" and "pick
+ * commit-id fixup!/squash! msg" in it so that the latter is put immediately
+ * after the former, and change "pick" to "fixup"/"squash".
+ *
+ * Note that if the config has specified a custom instruction format, each log
+ * message will have to be retrieved from the commit (as the oneline in the
+ * script cannot be trusted) in order to normalize the autosquash arrangement.
+ */
+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;
+	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 (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
+		todo_list_release(&todo_list);
+		return -1;
+	}
+
+	/*
+	 * The hashmap maps onelines to the respective todo list index.
+	 *
+	 * If any items need to be rearranged, the next[i] value will indicate
+	 * which item was moved directly after the i'th.
+	 *
+	 * In that case, last[i] will indicate the index of the latest item to
+	 * be moved to appear after the i'th.
+	 */
+	hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp,
+		     NULL, todo_list.nr);
+	ALLOC_ARRAY(next, todo_list.nr);
+	ALLOC_ARRAY(tail, todo_list.nr);
+	ALLOC_ARRAY(subjects, todo_list.nr);
+	for (i = 0; i < todo_list.nr; i++) {
+		struct strbuf buf = STRBUF_INIT;
+		struct todo_item *item = todo_list.items + i;
+		const char *commit_buffer, *subject, *p;
+		size_t subject_len;
+		int i2 = -1;
+		struct subject2item_entry *entry;
+
+		next[i] = tail[i] = -1;
+		if (item->command >= TODO_EXEC) {
+			subjects[i] = NULL;
+			continue;
+		}
+
+		if (is_fixup(item->command)) {
+			todo_list_release(&todo_list);
+			return error(_("the script was already rearranged."));
+		}
+
+		item->commit->util = item;
+
+		parse_commit(item->commit);
+		commit_buffer = get_commit_buffer(item->commit, NULL);
+		find_commit_subject(commit_buffer, &subject);
+		format_subject(&buf, subject, " ");
+		subject = subjects[i] = strbuf_detach(&buf, &subject_len);
+		unuse_commit_buffer(item->commit, commit_buffer);
+		if ((skip_prefix(subject, "fixup! ", &p) ||
+		     skip_prefix(subject, "squash! ", &p))) {
+			struct commit *commit2;
+
+			for (;;) {
+				while (isspace(*p))
+					p++;
+				if (!skip_prefix(p, "fixup! ", &p) &&
+				    !skip_prefix(p, "squash! ", &p))
+					break;
+			}
+
+			if ((entry = hashmap_get_from_hash(&subject2item,
+							   strhash(p), p)))
+				/* found by title */
+				i2 = entry->i;
+			else if (!strchr(p, ' ') &&
+				 (commit2 =
+				  lookup_commit_reference_by_name(p)) &&
+				 commit2->util)
+				/* found by commit name */
+				i2 = (struct todo_item *)commit2->util
+					- todo_list.items;
+			else {
+				/* copy can be a prefix of the commit subject */
+				for (i2 = 0; i2 < i; i2++)
+					if (subjects[i2] &&
+					    starts_with(subjects[i2], p))
+						break;
+				if (i2 == i)
+					i2 = -1;
+			}
+		}
+		if (i2 >= 0) {
+			rearranged = 1;
+			todo_list.items[i].command =
+				starts_with(subject, "fixup!") ?
+				TODO_FIXUP : TODO_SQUASH;
+			if (next[i2] < 0)
+				next[i2] = i;
+			else
+				next[tail[i2]] = i;
+			tail[i2] = i;
+		} else if (!hashmap_get_from_hash(&subject2item,
+						strhash(subject), subject)) {
+			FLEX_ALLOC_MEM(entry, subject, subject, subject_len);
+			entry->i = i;
+			hashmap_entry_init(entry, strhash(entry->subject));
+			hashmap_put(&subject2item, entry);
+		}
+	}
+
+	if (rearranged) {
+		struct strbuf buf = STRBUF_INIT;
+
+		for (i = 0; i < todo_list.nr; i++) {
+			enum todo_command command = todo_list.items[i].command;
+			int cur = i;
+
+			/*
+			 * Initially, all commands are 'pick's. If it is a
+			 * fixup or a squash now, we have rearranged it.
+			 */
+			if (is_fixup(command))
+				continue;
+
+			while (cur >= 0) {
+				int offset = todo_list.items[cur].offset_in_buf;
+				int end_offset = cur + 1 < todo_list.nr ?
+					todo_list.items[cur + 1].offset_in_buf :
+					todo_list.buf.len;
+				char *bol = todo_list.buf.buf + offset;
+				char *eol = todo_list.buf.buf + end_offset;
+
+				/* replace 'pick', by 'fixup' or 'squash' */
+				command = todo_list.items[cur].command;
+				if (is_fixup(command)) {
+					strbuf_addstr(&buf,
+						todo_command_info[command].str);
+					bol += strcspn(bol, " \t");
+				}
+
+				strbuf_add(&buf, bol, eol - bol);
+
+				cur = next[cur];
+			}
+		}
+
+		fd = open(todo_file, O_WRONLY);
+		if (fd < 0)
+			res = error_errno(_("could not open '%s'"), todo_file);
+		else if (write(fd, buf.buf, buf.len) < 0)
+			res = error_errno(_("could not write to '%s'"), todo_file);
+		else if (ftruncate(fd, buf.len) < 0)
+			res = error_errno(_("could not truncate '%s'"),
+					   todo_file);
+		close(fd);
+		strbuf_release(&buf);
+	}
+
+	free(next);
+	free(tail);
+	for (i = 0; i < todo_list.nr; i++)
+		free(subjects[i]);
+	free(subjects);
+	hashmap_free(&subject2item, 1);
+	todo_list_release(&todo_list);
+
+	return res;
+}
diff --git a/sequencer.h b/sequencer.h
index f885b6839..6f3d3df82 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -45,6 +45,14 @@ int sequencer_continue(struct replay_opts *opts);
 int sequencer_rollback(struct replay_opts *opts);
 int sequencer_remove_state(struct replay_opts *opts);
 
+int sequencer_make_script(int keep_empty, FILE *out,
+		int argc, const char **argv);
+
+int transform_todo_ids(int shorten_ids);
+int check_todo_list(void);
+int skip_unnecessary_picks(void);
+int rearrange_squash(void);
+
 extern const char sign_off_header[];
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
diff --git a/server-info.c b/server-info.c
index 5ec5b1d82..26a6c20b7 100644
--- a/server-info.c
+++ b/server-info.c
@@ -3,6 +3,7 @@
 #include "object.h"
 #include "commit.h"
 #include "tag.h"
+#include "packfile.h"
 
 /*
  * Create the file "path" by writing to a temporary file and renaming
diff --git a/setup.c b/setup.c
index 860507e1f..03f51e056 100644
--- a/setup.c
+++ b/setup.c
@@ -230,7 +230,7 @@ void verify_filename(const char *prefix,
 		     int diagnose_misspelt_rev)
 {
 	if (*arg == '-')
-		die("bad flag '%s' used after filename", 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);
@@ -399,11 +399,6 @@ void setup_work_tree(void)
 	if (getenv(GIT_WORK_TREE_ENVIRONMENT))
 		setenv(GIT_WORK_TREE_ENVIRONMENT, ".", 1);
 
-	/*
-	 * NEEDSWORK: this call can essentially be set_git_dir(get_git_dir())
-	 * which can cause some problems when trying to free the old value of
-	 * gitdir.
-	 */
 	set_git_dir(remove_leading_path(git_dir, work_tree));
 	initialized = 1;
 }
@@ -546,7 +541,8 @@ void read_gitfile_error_die(int error_code, const char *path, const char *dir)
 
 /*
  * Try to read the location of the git directory from the .git file,
- * return path to git directory if found.
+ * return path to git directory if found. The return value comes from
+ * a shared buffer.
  *
  * On failure, if return_error_code is not NULL, return_error_code
  * will be set to an error code and NULL will be returned. If
@@ -1027,7 +1023,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 {
 	static struct strbuf cwd = STRBUF_INIT;
 	struct strbuf dir = STRBUF_INIT, gitdir = STRBUF_INIT;
-	const char *prefix, *env_prefix;
+	const char *prefix;
 
 	/*
 	 * We may have read an incomplete configuration before
@@ -1085,16 +1081,6 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		die("BUG: unhandled setup_git_directory_1() result");
 	}
 
-	/*
-	 * NEEDSWORK: This was a hack in order to get ls-files and grep to have
-	 * properly formated output when recursing submodules.  Once ls-files
-	 * and grep have been changed to perform this recursing in-process this
-	 * needs to be removed.
-	 */
-	env_prefix = getenv(GIT_TOPLEVEL_PREFIX_ENVIRONMENT);
-	if (env_prefix)
-		prefix = env_prefix;
-
 	if (prefix)
 		setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
 	else
diff --git a/sha1-lookup.c b/sha1-lookup.c
index 2552b7902..4cf3ebd92 100644
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -10,7 +10,7 @@ static uint32_t take2(const unsigned char *sha1)
  * Conventional binary search loop looks like this:
  *
  *      do {
- *              int mi = (lo + hi) / 2;
+ *              int mi = lo + (hi - lo) / 2;
  *              int cmp = "entry pointed at by mi" minus "target";
  *              if (!cmp)
  *                      return (mi is the wanted one)
@@ -95,7 +95,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 			hi = mi;
 		else
 			lo = mi + 1;
-		mi = (hi + lo) / 2;
+		mi = lo + (hi - lo) / 2;
 	} while (lo < hi);
 	return -lo-1;
 }
diff --git a/sha1_file.c b/sha1_file.c
index 5911364a8..10c3a0083 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -28,11 +28,9 @@
 #include "list.h"
 #include "mergesort.h"
 #include "quote.h"
+#include "packfile.h"
 
-#define SZ_FMT PRIuMAX
-static inline uintmax_t sz_fmt(size_t s) { return s; }
-
-const unsigned char null_sha1[20];
+const unsigned char null_sha1[GIT_MAX_RAWSZ];
 const struct object_id null_oid;
 const struct object_id empty_tree_oid = {
 	EMPTY_TREE_SHA1_BIN_LITERAL
@@ -278,28 +276,6 @@ static const char *alt_sha1_path(struct alternate_object_database *alt,
 	return buf->buf;
 }
 
- char *odb_pack_name(struct strbuf *buf,
-		     const unsigned char *sha1,
-		     const char *ext)
-{
-	strbuf_reset(buf);
-	strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
-		    sha1_to_hex(sha1), ext);
-	return buf->buf;
-}
-
-char *sha1_pack_name(const unsigned char *sha1)
-{
-	static struct strbuf buf = STRBUF_INIT;
-	return odb_pack_name(&buf, sha1, "pack");
-}
-
-char *sha1_pack_index_name(const unsigned char *sha1)
-{
-	static struct strbuf buf = STRBUF_INIT;
-	return odb_pack_name(&buf, sha1, "idx");
-}
-
 struct alternate_object_database *alt_odb_list;
 static struct alternate_object_database **alt_odb_tail;
 
@@ -422,7 +398,7 @@ static const char *parse_alt_odb_entry(const char *string,
 	return end;
 }
 
-static void link_alt_odb_entries(const char *alt, int len, int sep,
+static void link_alt_odb_entries(const char *alt, int sep,
 				 const char *relative_base, int depth)
 {
 	struct strbuf objdirbuf = STRBUF_INIT;
@@ -451,28 +427,19 @@ static void link_alt_odb_entries(const char *alt, int len, int sep,
 
 static void read_info_alternates(const char * relative_base, int depth)
 {
-	char *map;
-	size_t mapsz;
-	struct stat st;
 	char *path;
-	int fd;
+	struct strbuf buf = STRBUF_INIT;
 
 	path = xstrfmt("%s/info/alternates", relative_base);
-	fd = git_open(path);
-	free(path);
-	if (fd < 0)
-		return;
-	if (fstat(fd, &st) || (st.st_size == 0)) {
-		close(fd);
+	if (strbuf_read_file(&buf, path, 1024) < 0) {
+		warn_on_fopen_errors(path);
+		free(path);
 		return;
 	}
-	mapsz = xsize_t(st.st_size);
-	map = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, fd, 0);
-	close(fd);
 
-	link_alt_odb_entries(map, mapsz, '\n', relative_base, depth);
-
-	munmap(map, mapsz);
+	link_alt_odb_entries(buf.buf, '\n', relative_base, depth);
+	strbuf_release(&buf);
+	free(path);
 }
 
 struct alternate_object_database *alloc_alt_odb(const char *dir)
@@ -527,7 +494,7 @@ void add_to_alternates_file(const char *reference)
 		if (commit_lock_file(lock))
 			die_errno("unable to move new alternates file into place");
 		if (alt_odb_tail)
-			link_alt_odb_entries(reference, strlen(reference), '\n', NULL, 0);
+			link_alt_odb_entries(reference, '\n', NULL, 0);
 	}
 	free(alts);
 }
@@ -540,7 +507,7 @@ void add_to_alternates_memory(const char *reference)
 	 */
 	prepare_alt_odb();
 
-	link_alt_odb_entries(reference, strlen(reference), '\n', NULL, 0);
+	link_alt_odb_entries(reference, '\n', NULL, 0);
 }
 
 /*
@@ -643,7 +610,7 @@ void prepare_alt_odb(void)
 	if (!alt) alt = "";
 
 	alt_odb_tail = &alt_odb_list;
-	link_alt_odb_entries(alt, strlen(alt), PATH_SEP, NULL, 0);
+	link_alt_odb_entries(alt, PATH_SEP, NULL, 0);
 
 	read_info_alternates(get_object_directory(), 0);
 }
@@ -705,213 +672,6 @@ static int has_loose_object(const unsigned char *sha1)
 	return check_and_freshen(sha1, 0);
 }
 
-static unsigned int pack_used_ctr;
-static unsigned int pack_mmap_calls;
-static unsigned int peak_pack_open_windows;
-static unsigned int pack_open_windows;
-static unsigned int pack_open_fds;
-static unsigned int pack_max_fds;
-static size_t peak_pack_mapped;
-static size_t pack_mapped;
-struct packed_git *packed_git;
-
-static struct mru packed_git_mru_storage;
-struct mru *packed_git_mru = &packed_git_mru_storage;
-
-void pack_report(void)
-{
-	fprintf(stderr,
-		"pack_report: getpagesize()            = %10" SZ_FMT "\n"
-		"pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
-		"pack_report: core.packedGitLimit      = %10" SZ_FMT "\n",
-		sz_fmt(getpagesize()),
-		sz_fmt(packed_git_window_size),
-		sz_fmt(packed_git_limit));
-	fprintf(stderr,
-		"pack_report: pack_used_ctr            = %10u\n"
-		"pack_report: pack_mmap_calls          = %10u\n"
-		"pack_report: pack_open_windows        = %10u / %10u\n"
-		"pack_report: pack_mapped              = "
-			"%10" SZ_FMT " / %10" SZ_FMT "\n",
-		pack_used_ctr,
-		pack_mmap_calls,
-		pack_open_windows, peak_pack_open_windows,
-		sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
-}
-
-/*
- * Open and mmap the index file at path, perform a couple of
- * consistency checks, then record its information to p.  Return 0 on
- * success.
- */
-static int check_packed_git_idx(const char *path, struct packed_git *p)
-{
-	void *idx_map;
-	struct pack_idx_header *hdr;
-	size_t idx_size;
-	uint32_t version, nr, i, *index;
-	int fd = git_open(path);
-	struct stat st;
-
-	if (fd < 0)
-		return -1;
-	if (fstat(fd, &st)) {
-		close(fd);
-		return -1;
-	}
-	idx_size = xsize_t(st.st_size);
-	if (idx_size < 4 * 256 + 20 + 20) {
-		close(fd);
-		return error("index file %s is too small", path);
-	}
-	idx_map = xmmap(NULL, idx_size, PROT_READ, MAP_PRIVATE, fd, 0);
-	close(fd);
-
-	hdr = idx_map;
-	if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
-		version = ntohl(hdr->idx_version);
-		if (version < 2 || version > 2) {
-			munmap(idx_map, idx_size);
-			return error("index file %s is version %"PRIu32
-				     " and is not supported by this binary"
-				     " (try upgrading GIT to a newer version)",
-				     path, version);
-		}
-	} else
-		version = 1;
-
-	nr = 0;
-	index = idx_map;
-	if (version > 1)
-		index += 2;  /* skip index header */
-	for (i = 0; i < 256; i++) {
-		uint32_t n = ntohl(index[i]);
-		if (n < nr) {
-			munmap(idx_map, idx_size);
-			return error("non-monotonic index %s", path);
-		}
-		nr = n;
-	}
-
-	if (version == 1) {
-		/*
-		 * Total size:
-		 *  - 256 index entries 4 bytes each
-		 *  - 24-byte entries * nr (20-byte sha1 + 4-byte offset)
-		 *  - 20-byte SHA1 of the packfile
-		 *  - 20-byte SHA1 file checksum
-		 */
-		if (idx_size != 4*256 + nr * 24 + 20 + 20) {
-			munmap(idx_map, idx_size);
-			return error("wrong index v1 file size in %s", path);
-		}
-	} else if (version == 2) {
-		/*
-		 * Minimum size:
-		 *  - 8 bytes of header
-		 *  - 256 index entries 4 bytes each
-		 *  - 20-byte sha1 entry * nr
-		 *  - 4-byte crc entry * nr
-		 *  - 4-byte offset entry * nr
-		 *  - 20-byte SHA1 of the packfile
-		 *  - 20-byte SHA1 file checksum
-		 * And after the 4-byte offset table might be a
-		 * variable sized table containing 8-byte entries
-		 * for offsets larger than 2^31.
-		 */
-		unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20;
-		unsigned long max_size = min_size;
-		if (nr)
-			max_size += (nr - 1)*8;
-		if (idx_size < min_size || idx_size > max_size) {
-			munmap(idx_map, idx_size);
-			return error("wrong index v2 file size in %s", path);
-		}
-		if (idx_size != min_size &&
-		    /*
-		     * make sure we can deal with large pack offsets.
-		     * 31-bit signed offset won't be enough, neither
-		     * 32-bit unsigned one will be.
-		     */
-		    (sizeof(off_t) <= 4)) {
-			munmap(idx_map, idx_size);
-			return error("pack too large for current definition of off_t in %s", path);
-		}
-	}
-
-	p->index_version = version;
-	p->index_data = idx_map;
-	p->index_size = idx_size;
-	p->num_objects = nr;
-	return 0;
-}
-
-int open_pack_index(struct packed_git *p)
-{
-	char *idx_name;
-	size_t len;
-	int ret;
-
-	if (p->index_data)
-		return 0;
-
-	if (!strip_suffix(p->pack_name, ".pack", &len))
-		die("BUG: pack_name does not end in .pack");
-	idx_name = xstrfmt("%.*s.idx", (int)len, p->pack_name);
-	ret = check_packed_git_idx(idx_name, p);
-	free(idx_name);
-	return ret;
-}
-
-static void scan_windows(struct packed_git *p,
-	struct packed_git **lru_p,
-	struct pack_window **lru_w,
-	struct pack_window **lru_l)
-{
-	struct pack_window *w, *w_l;
-
-	for (w_l = NULL, w = p->windows; w; w = w->next) {
-		if (!w->inuse_cnt) {
-			if (!*lru_w || w->last_used < (*lru_w)->last_used) {
-				*lru_p = p;
-				*lru_w = w;
-				*lru_l = w_l;
-			}
-		}
-		w_l = w;
-	}
-}
-
-static int unuse_one_window(struct packed_git *current)
-{
-	struct packed_git *p, *lru_p = NULL;
-	struct pack_window *lru_w = NULL, *lru_l = NULL;
-
-	if (current)
-		scan_windows(current, &lru_p, &lru_w, &lru_l);
-	for (p = packed_git; p; p = p->next)
-		scan_windows(p, &lru_p, &lru_w, &lru_l);
-	if (lru_p) {
-		munmap(lru_w->base, lru_w->len);
-		pack_mapped -= lru_w->len;
-		if (lru_l)
-			lru_l->next = lru_w->next;
-		else
-			lru_p->windows = lru_w->next;
-		free(lru_w);
-		pack_open_windows--;
-		return 1;
-	}
-	return 0;
-}
-
-void release_pack_memory(size_t need)
-{
-	size_t cur = pack_mapped;
-	while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
-		; /* nothing */
-}
-
 static void mmap_limit_check(size_t length)
 {
 	static size_t limit = 0;
@@ -950,681 +710,6 @@ void *xmmap(void *start, size_t length,
 	return ret;
 }
 
-void close_pack_windows(struct packed_git *p)
-{
-	while (p->windows) {
-		struct pack_window *w = p->windows;
-
-		if (w->inuse_cnt)
-			die("pack '%s' still has open windows to it",
-			    p->pack_name);
-		munmap(w->base, w->len);
-		pack_mapped -= w->len;
-		pack_open_windows--;
-		p->windows = w->next;
-		free(w);
-	}
-}
-
-static int close_pack_fd(struct packed_git *p)
-{
-	if (p->pack_fd < 0)
-		return 0;
-
-	close(p->pack_fd);
-	pack_open_fds--;
-	p->pack_fd = -1;
-
-	return 1;
-}
-
-static void close_pack(struct packed_git *p)
-{
-	close_pack_windows(p);
-	close_pack_fd(p);
-	close_pack_index(p);
-}
-
-void close_all_packs(void)
-{
-	struct packed_git *p;
-
-	for (p = packed_git; p; p = p->next)
-		if (p->do_not_close)
-			die("BUG: want to close pack marked 'do-not-close'");
-		else
-			close_pack(p);
-}
-
-
-/*
- * The LRU pack is the one with the oldest MRU window, preferring packs
- * with no used windows, or the oldest mtime if it has no windows allocated.
- */
-static void find_lru_pack(struct packed_git *p, struct packed_git **lru_p, struct pack_window **mru_w, int *accept_windows_inuse)
-{
-	struct pack_window *w, *this_mru_w;
-	int has_windows_inuse = 0;
-
-	/*
-	 * Reject this pack if it has windows and the previously selected
-	 * one does not.  If this pack does not have windows, reject
-	 * it if the pack file is newer than the previously selected one.
-	 */
-	if (*lru_p && !*mru_w && (p->windows || p->mtime > (*lru_p)->mtime))
-		return;
-
-	for (w = this_mru_w = p->windows; w; w = w->next) {
-		/*
-		 * Reject this pack if any of its windows are in use,
-		 * but the previously selected pack did not have any
-		 * inuse windows.  Otherwise, record that this pack
-		 * has windows in use.
-		 */
-		if (w->inuse_cnt) {
-			if (*accept_windows_inuse)
-				has_windows_inuse = 1;
-			else
-				return;
-		}
-
-		if (w->last_used > this_mru_w->last_used)
-			this_mru_w = w;
-
-		/*
-		 * Reject this pack if it has windows that have been
-		 * used more recently than the previously selected pack.
-		 * If the previously selected pack had windows inuse and
-		 * we have not encountered a window in this pack that is
-		 * inuse, skip this check since we prefer a pack with no
-		 * inuse windows to one that has inuse windows.
-		 */
-		if (*mru_w && *accept_windows_inuse == has_windows_inuse &&
-		    this_mru_w->last_used > (*mru_w)->last_used)
-			return;
-	}
-
-	/*
-	 * Select this pack.
-	 */
-	*mru_w = this_mru_w;
-	*lru_p = p;
-	*accept_windows_inuse = has_windows_inuse;
-}
-
-static int close_one_pack(void)
-{
-	struct packed_git *p, *lru_p = NULL;
-	struct pack_window *mru_w = NULL;
-	int accept_windows_inuse = 1;
-
-	for (p = packed_git; p; p = p->next) {
-		if (p->pack_fd == -1)
-			continue;
-		find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse);
-	}
-
-	if (lru_p)
-		return close_pack_fd(lru_p);
-
-	return 0;
-}
-
-void unuse_pack(struct pack_window **w_cursor)
-{
-	struct pack_window *w = *w_cursor;
-	if (w) {
-		w->inuse_cnt--;
-		*w_cursor = NULL;
-	}
-}
-
-void close_pack_index(struct packed_git *p)
-{
-	if (p->index_data) {
-		munmap((void *)p->index_data, p->index_size);
-		p->index_data = NULL;
-	}
-}
-
-static unsigned int get_max_fd_limit(void)
-{
-#ifdef RLIMIT_NOFILE
-	{
-		struct rlimit lim;
-
-		if (!getrlimit(RLIMIT_NOFILE, &lim))
-			return lim.rlim_cur;
-	}
-#endif
-
-#ifdef _SC_OPEN_MAX
-	{
-		long open_max = sysconf(_SC_OPEN_MAX);
-		if (0 < open_max)
-			return open_max;
-		/*
-		 * Otherwise, we got -1 for one of the two
-		 * reasons:
-		 *
-		 * (1) sysconf() did not understand _SC_OPEN_MAX
-		 *     and signaled an error with -1; or
-		 * (2) sysconf() said there is no limit.
-		 *
-		 * We _could_ clear errno before calling sysconf() to
-		 * tell these two cases apart and return a huge number
-		 * in the latter case to let the caller cap it to a
-		 * value that is not so selfish, but letting the
-		 * fallback OPEN_MAX codepath take care of these cases
-		 * is a lot simpler.
-		 */
-	}
-#endif
-
-#ifdef OPEN_MAX
-	return OPEN_MAX;
-#else
-	return 1; /* see the caller ;-) */
-#endif
-}
-
-/*
- * Do not call this directly as this leaks p->pack_fd on error return;
- * call open_packed_git() instead.
- */
-static int open_packed_git_1(struct packed_git *p)
-{
-	struct stat st;
-	struct pack_header hdr;
-	unsigned char sha1[20];
-	unsigned char *idx_sha1;
-	long fd_flag;
-
-	if (!p->index_data && open_pack_index(p))
-		return error("packfile %s index unavailable", p->pack_name);
-
-	if (!pack_max_fds) {
-		unsigned int max_fds = get_max_fd_limit();
-
-		/* Save 3 for stdin/stdout/stderr, 22 for work */
-		if (25 < max_fds)
-			pack_max_fds = max_fds - 25;
-		else
-			pack_max_fds = 1;
-	}
-
-	while (pack_max_fds <= pack_open_fds && close_one_pack())
-		; /* nothing */
-
-	p->pack_fd = git_open(p->pack_name);
-	if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
-		return -1;
-	pack_open_fds++;
-
-	/* If we created the struct before we had the pack we lack size. */
-	if (!p->pack_size) {
-		if (!S_ISREG(st.st_mode))
-			return error("packfile %s not a regular file", p->pack_name);
-		p->pack_size = st.st_size;
-	} else if (p->pack_size != st.st_size)
-		return error("packfile %s size changed", p->pack_name);
-
-	/* We leave these file descriptors open with sliding mmap;
-	 * there is no point keeping them open across exec(), though.
-	 */
-	fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
-	if (fd_flag < 0)
-		return error("cannot determine file descriptor flags");
-	fd_flag |= FD_CLOEXEC;
-	if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
-		return error("cannot set FD_CLOEXEC");
-
-	/* Verify we recognize this pack file format. */
-	if (read_in_full(p->pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
-		return error("file %s is far too short to be a packfile", p->pack_name);
-	if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
-		return error("file %s is not a GIT packfile", p->pack_name);
-	if (!pack_version_ok(hdr.hdr_version))
-		return error("packfile %s is version %"PRIu32" and not"
-			" supported (try upgrading GIT to a newer version)",
-			p->pack_name, ntohl(hdr.hdr_version));
-
-	/* Verify the pack matches its index. */
-	if (p->num_objects != ntohl(hdr.hdr_entries))
-		return error("packfile %s claims to have %"PRIu32" objects"
-			     " while index indicates %"PRIu32" objects",
-			     p->pack_name, ntohl(hdr.hdr_entries),
-			     p->num_objects);
-	if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
-		return error("end of packfile %s is unavailable", p->pack_name);
-	if (read_in_full(p->pack_fd, sha1, sizeof(sha1)) != sizeof(sha1))
-		return error("packfile %s signature is unavailable", p->pack_name);
-	idx_sha1 = ((unsigned char *)p->index_data) + p->index_size - 40;
-	if (hashcmp(sha1, idx_sha1))
-		return error("packfile %s does not match index", p->pack_name);
-	return 0;
-}
-
-static int open_packed_git(struct packed_git *p)
-{
-	if (!open_packed_git_1(p))
-		return 0;
-	close_pack_fd(p);
-	return -1;
-}
-
-static int in_window(struct pack_window *win, off_t offset)
-{
-	/* We must promise at least 20 bytes (one hash) after the
-	 * offset is available from this window, otherwise the offset
-	 * is not actually in this window and a different window (which
-	 * has that one hash excess) must be used.  This is to support
-	 * the object header and delta base parsing routines below.
-	 */
-	off_t win_off = win->offset;
-	return win_off <= offset
-		&& (offset + 20) <= (win_off + win->len);
-}
-
-unsigned char *use_pack(struct packed_git *p,
-		struct pack_window **w_cursor,
-		off_t offset,
-		unsigned long *left)
-{
-	struct pack_window *win = *w_cursor;
-
-	/* Since packfiles end in a hash of their content and it's
-	 * pointless to ask for an offset into the middle of that
-	 * hash, and the in_window function above wouldn't match
-	 * don't allow an offset too close to the end of the file.
-	 */
-	if (!p->pack_size && p->pack_fd == -1 && open_packed_git(p))
-		die("packfile %s cannot be accessed", p->pack_name);
-	if (offset > (p->pack_size - 20))
-		die("offset beyond end of packfile (truncated pack?)");
-	if (offset < 0)
-		die(_("offset before end of packfile (broken .idx?)"));
-
-	if (!win || !in_window(win, offset)) {
-		if (win)
-			win->inuse_cnt--;
-		for (win = p->windows; win; win = win->next) {
-			if (in_window(win, offset))
-				break;
-		}
-		if (!win) {
-			size_t window_align = packed_git_window_size / 2;
-			off_t len;
-
-			if (p->pack_fd == -1 && open_packed_git(p))
-				die("packfile %s cannot be accessed", p->pack_name);
-
-			win = xcalloc(1, sizeof(*win));
-			win->offset = (offset / window_align) * window_align;
-			len = p->pack_size - win->offset;
-			if (len > packed_git_window_size)
-				len = packed_git_window_size;
-			win->len = (size_t)len;
-			pack_mapped += win->len;
-			while (packed_git_limit < pack_mapped
-				&& unuse_one_window(p))
-				; /* nothing */
-			win->base = xmmap(NULL, win->len,
-				PROT_READ, MAP_PRIVATE,
-				p->pack_fd, win->offset);
-			if (win->base == MAP_FAILED)
-				die_errno("packfile %s cannot be mapped",
-					  p->pack_name);
-			if (!win->offset && win->len == p->pack_size
-				&& !p->do_not_close)
-				close_pack_fd(p);
-			pack_mmap_calls++;
-			pack_open_windows++;
-			if (pack_mapped > peak_pack_mapped)
-				peak_pack_mapped = pack_mapped;
-			if (pack_open_windows > peak_pack_open_windows)
-				peak_pack_open_windows = pack_open_windows;
-			win->next = p->windows;
-			p->windows = win;
-		}
-	}
-	if (win != *w_cursor) {
-		win->last_used = pack_used_ctr++;
-		win->inuse_cnt++;
-		*w_cursor = win;
-	}
-	offset -= win->offset;
-	if (left)
-		*left = win->len - xsize_t(offset);
-	return win->base + offset;
-}
-
-static struct packed_git *alloc_packed_git(int extra)
-{
-	struct packed_git *p = xmalloc(st_add(sizeof(*p), extra));
-	memset(p, 0, sizeof(*p));
-	p->pack_fd = -1;
-	return p;
-}
-
-static void try_to_free_pack_memory(size_t size)
-{
-	release_pack_memory(size);
-}
-
-struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
-{
-	static int have_set_try_to_free_routine;
-	struct stat st;
-	size_t alloc;
-	struct packed_git *p;
-
-	if (!have_set_try_to_free_routine) {
-		have_set_try_to_free_routine = 1;
-		set_try_to_free_routine(try_to_free_pack_memory);
-	}
-
-	/*
-	 * Make sure a corresponding .pack file exists and that
-	 * the index looks sane.
-	 */
-	if (!strip_suffix_mem(path, &path_len, ".idx"))
-		return NULL;
-
-	/*
-	 * ".pack" is long enough to hold any suffix we're adding (and
-	 * the use xsnprintf double-checks that)
-	 */
-	alloc = st_add3(path_len, strlen(".pack"), 1);
-	p = alloc_packed_git(alloc);
-	memcpy(p->pack_name, path, path_len);
-
-	xsnprintf(p->pack_name + path_len, alloc - path_len, ".keep");
-	if (!access(p->pack_name, F_OK))
-		p->pack_keep = 1;
-
-	xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
-	if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
-		free(p);
-		return NULL;
-	}
-
-	/* ok, it looks sane as far as we can check without
-	 * actually mapping the pack file.
-	 */
-	p->pack_size = st.st_size;
-	p->pack_local = local;
-	p->mtime = st.st_mtime;
-	if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1))
-		hashclr(p->sha1);
-	return p;
-}
-
-struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)
-{
-	const char *path = sha1_pack_name(sha1);
-	size_t alloc = st_add(strlen(path), 1);
-	struct packed_git *p = alloc_packed_git(alloc);
-
-	memcpy(p->pack_name, path, alloc); /* includes NUL */
-	hashcpy(p->sha1, sha1);
-	if (check_packed_git_idx(idx_path, p)) {
-		free(p);
-		return NULL;
-	}
-
-	return p;
-}
-
-void install_packed_git(struct packed_git *pack)
-{
-	if (pack->pack_fd != -1)
-		pack_open_fds++;
-
-	pack->next = packed_git;
-	packed_git = pack;
-}
-
-void (*report_garbage)(unsigned seen_bits, const char *path);
-
-static void report_helper(const struct string_list *list,
-			  int seen_bits, int first, int last)
-{
-	if (seen_bits == (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX))
-		return;
-
-	for (; first < last; first++)
-		report_garbage(seen_bits, list->items[first].string);
-}
-
-static void report_pack_garbage(struct string_list *list)
-{
-	int i, baselen = -1, first = 0, seen_bits = 0;
-
-	if (!report_garbage)
-		return;
-
-	string_list_sort(list);
-
-	for (i = 0; i < list->nr; i++) {
-		const char *path = list->items[i].string;
-		if (baselen != -1 &&
-		    strncmp(path, list->items[first].string, baselen)) {
-			report_helper(list, seen_bits, first, i);
-			baselen = -1;
-			seen_bits = 0;
-		}
-		if (baselen == -1) {
-			const char *dot = strrchr(path, '.');
-			if (!dot) {
-				report_garbage(PACKDIR_FILE_GARBAGE, path);
-				continue;
-			}
-			baselen = dot - path + 1;
-			first = i;
-		}
-		if (!strcmp(path + baselen, "pack"))
-			seen_bits |= 1;
-		else if (!strcmp(path + baselen, "idx"))
-			seen_bits |= 2;
-	}
-	report_helper(list, seen_bits, first, list->nr);
-}
-
-static void prepare_packed_git_one(char *objdir, int local)
-{
-	struct strbuf path = STRBUF_INIT;
-	size_t dirnamelen;
-	DIR *dir;
-	struct dirent *de;
-	struct string_list garbage = STRING_LIST_INIT_DUP;
-
-	strbuf_addstr(&path, objdir);
-	strbuf_addstr(&path, "/pack");
-	dir = opendir(path.buf);
-	if (!dir) {
-		if (errno != ENOENT)
-			error_errno("unable to open object pack directory: %s",
-				    path.buf);
-		strbuf_release(&path);
-		return;
-	}
-	strbuf_addch(&path, '/');
-	dirnamelen = path.len;
-	while ((de = readdir(dir)) != NULL) {
-		struct packed_git *p;
-		size_t base_len;
-
-		if (is_dot_or_dotdot(de->d_name))
-			continue;
-
-		strbuf_setlen(&path, dirnamelen);
-		strbuf_addstr(&path, de->d_name);
-
-		base_len = path.len;
-		if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
-			/* Don't reopen a pack we already have. */
-			for (p = packed_git; p; p = p->next) {
-				size_t len;
-				if (strip_suffix(p->pack_name, ".pack", &len) &&
-				    len == base_len &&
-				    !memcmp(p->pack_name, path.buf, len))
-					break;
-			}
-			if (p == NULL &&
-			    /*
-			     * See if it really is a valid .idx file with
-			     * corresponding .pack file that we can map.
-			     */
-			    (p = add_packed_git(path.buf, path.len, local)) != NULL)
-				install_packed_git(p);
-		}
-
-		if (!report_garbage)
-			continue;
-
-		if (ends_with(de->d_name, ".idx") ||
-		    ends_with(de->d_name, ".pack") ||
-		    ends_with(de->d_name, ".bitmap") ||
-		    ends_with(de->d_name, ".keep"))
-			string_list_append(&garbage, path.buf);
-		else
-			report_garbage(PACKDIR_FILE_GARBAGE, path.buf);
-	}
-	closedir(dir);
-	report_pack_garbage(&garbage);
-	string_list_clear(&garbage, 0);
-	strbuf_release(&path);
-}
-
-static int approximate_object_count_valid;
-
-/*
- * Give a fast, rough count of the number of objects in the repository. This
- * ignores loose objects completely. If you have a lot of them, then either
- * you should repack because your performance will be awful, or they are
- * all unreachable objects about to be pruned, in which case they're not really
- * interesting as a measure of repo size in the first place.
- */
-unsigned long approximate_object_count(void)
-{
-	static unsigned long count;
-	if (!approximate_object_count_valid) {
-		struct packed_git *p;
-
-		prepare_packed_git();
-		count = 0;
-		for (p = packed_git; p; p = p->next) {
-			if (open_pack_index(p))
-				continue;
-			count += p->num_objects;
-		}
-	}
-	return count;
-}
-
-static void *get_next_packed_git(const void *p)
-{
-	return ((const struct packed_git *)p)->next;
-}
-
-static void set_next_packed_git(void *p, void *next)
-{
-	((struct packed_git *)p)->next = next;
-}
-
-static int sort_pack(const void *a_, const void *b_)
-{
-	const struct packed_git *a = a_;
-	const struct packed_git *b = b_;
-	int st;
-
-	/*
-	 * Local packs tend to contain objects specific to our
-	 * variant of the project than remote ones.  In addition,
-	 * remote ones could be on a network mounted filesystem.
-	 * Favor local ones for these reasons.
-	 */
-	st = a->pack_local - b->pack_local;
-	if (st)
-		return -st;
-
-	/*
-	 * Younger packs tend to contain more recent objects,
-	 * and more recent objects tend to get accessed more
-	 * often.
-	 */
-	if (a->mtime < b->mtime)
-		return 1;
-	else if (a->mtime == b->mtime)
-		return 0;
-	return -1;
-}
-
-static void rearrange_packed_git(void)
-{
-	packed_git = llist_mergesort(packed_git, get_next_packed_git,
-				     set_next_packed_git, sort_pack);
-}
-
-static void prepare_packed_git_mru(void)
-{
-	struct packed_git *p;
-
-	mru_clear(packed_git_mru);
-	for (p = packed_git; p; p = p->next)
-		mru_append(packed_git_mru, p);
-}
-
-static int prepare_packed_git_run_once = 0;
-void prepare_packed_git(void)
-{
-	struct alternate_object_database *alt;
-
-	if (prepare_packed_git_run_once)
-		return;
-	prepare_packed_git_one(get_object_directory(), 1);
-	prepare_alt_odb();
-	for (alt = alt_odb_list; alt; alt = alt->next)
-		prepare_packed_git_one(alt->path, 0);
-	rearrange_packed_git();
-	prepare_packed_git_mru();
-	prepare_packed_git_run_once = 1;
-}
-
-void reprepare_packed_git(void)
-{
-	approximate_object_count_valid = 0;
-	prepare_packed_git_run_once = 0;
-	prepare_packed_git();
-}
-
-static void mark_bad_packed_object(struct packed_git *p,
-				   const unsigned char *sha1)
-{
-	unsigned i;
-	for (i = 0; i < p->num_bad_objects; i++)
-		if (!hashcmp(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
-			return;
-	p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
-				      st_mult(GIT_MAX_RAWSZ,
-					      st_add(p->num_bad_objects, 1)));
-	hashcpy(p->bad_object_sha1 + GIT_SHA1_RAWSZ * p->num_bad_objects, sha1);
-	p->num_bad_objects++;
-}
-
-static const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
-{
-	struct packed_git *p;
-	unsigned i;
-
-	for (p = packed_git; p; p = p->next)
-		for (i = 0; i < p->num_bad_objects; i++)
-			if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
-				return p;
-	return NULL;
-}
-
 /*
  * With an in-core object data in "map", rehash it to make sure the
  * object name actually matches "sha1" to detect object corruption.
@@ -1795,31 +880,6 @@ void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
 	return map_sha1_file_1(NULL, sha1, size);
 }
 
-unsigned long unpack_object_header_buffer(const unsigned char *buf,
-		unsigned long len, enum object_type *type, unsigned long *sizep)
-{
-	unsigned shift;
-	unsigned long size, c;
-	unsigned long used = 0;
-
-	c = buf[used++];
-	*type = (c >> 4) & 7;
-	size = c & 15;
-	shift = 4;
-	while (c & 0x80) {
-		if (len <= used || bitsizeof(long) <= shift) {
-			error("bad object header");
-			size = used = 0;
-			break;
-		}
-		c = buf[used++];
-		size += (c & 0x7f) << shift;
-		shift += 7;
-	}
-	*sizep = size;
-	return used;
-}
-
 static int unpack_sha1_short_header(git_zstream *stream,
 				    unsigned char *map, unsigned long mapsize,
 				    void *buffer, unsigned long bufsiz)
@@ -2006,894 +1066,6 @@ int parse_sha1_header(const char *hdr, unsigned long *sizep)
 	return parse_sha1_header_extended(hdr, &oi, 0);
 }
 
-unsigned long get_size_from_delta(struct packed_git *p,
-				  struct pack_window **w_curs,
-			          off_t curpos)
-{
-	const unsigned char *data;
-	unsigned char delta_head[20], *in;
-	git_zstream stream;
-	int st;
-
-	memset(&stream, 0, sizeof(stream));
-	stream.next_out = delta_head;
-	stream.avail_out = sizeof(delta_head);
-
-	git_inflate_init(&stream);
-	do {
-		in = use_pack(p, w_curs, curpos, &stream.avail_in);
-		stream.next_in = in;
-		st = git_inflate(&stream, Z_FINISH);
-		curpos += stream.next_in - in;
-	} while ((st == Z_OK || st == Z_BUF_ERROR) &&
-		 stream.total_out < sizeof(delta_head));
-	git_inflate_end(&stream);
-	if ((st != Z_STREAM_END) && stream.total_out != sizeof(delta_head)) {
-		error("delta data unpack-initial failed");
-		return 0;
-	}
-
-	/* Examine the initial part of the delta to figure out
-	 * the result size.
-	 */
-	data = delta_head;
-
-	/* ignore base size */
-	get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
-
-	/* Read the result size */
-	return get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
-}
-
-static off_t get_delta_base(struct packed_git *p,
-				    struct pack_window **w_curs,
-				    off_t *curpos,
-				    enum object_type type,
-				    off_t delta_obj_offset)
-{
-	unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
-	off_t base_offset;
-
-	/* use_pack() assured us we have [base_info, base_info + 20)
-	 * as a range that we can look at without walking off the
-	 * end of the mapped window.  Its actually the hash size
-	 * that is assured.  An OFS_DELTA longer than the hash size
-	 * is stupid, as then a REF_DELTA would be smaller to store.
-	 */
-	if (type == OBJ_OFS_DELTA) {
-		unsigned used = 0;
-		unsigned char c = base_info[used++];
-		base_offset = c & 127;
-		while (c & 128) {
-			base_offset += 1;
-			if (!base_offset || MSB(base_offset, 7))
-				return 0;  /* overflow */
-			c = base_info[used++];
-			base_offset = (base_offset << 7) + (c & 127);
-		}
-		base_offset = delta_obj_offset - base_offset;
-		if (base_offset <= 0 || base_offset >= delta_obj_offset)
-			return 0;  /* out of bound */
-		*curpos += used;
-	} else if (type == OBJ_REF_DELTA) {
-		/* The base entry _must_ be in the same pack */
-		base_offset = find_pack_entry_one(base_info, p);
-		*curpos += 20;
-	} else
-		die("I am totally screwed");
-	return base_offset;
-}
-
-/*
- * Like get_delta_base above, but we return the sha1 instead of the pack
- * offset. This means it is cheaper for REF deltas (we do not have to do
- * the final object lookup), but more expensive for OFS deltas (we
- * have to load the revidx to convert the offset back into a sha1).
- */
-static const unsigned char *get_delta_base_sha1(struct packed_git *p,
-						struct pack_window **w_curs,
-						off_t curpos,
-						enum object_type type,
-						off_t delta_obj_offset)
-{
-	if (type == OBJ_REF_DELTA) {
-		unsigned char *base = use_pack(p, w_curs, curpos, NULL);
-		return base;
-	} else if (type == OBJ_OFS_DELTA) {
-		struct revindex_entry *revidx;
-		off_t base_offset = get_delta_base(p, w_curs, &curpos,
-						   type, delta_obj_offset);
-
-		if (!base_offset)
-			return NULL;
-
-		revidx = find_pack_revindex(p, base_offset);
-		if (!revidx)
-			return NULL;
-
-		return nth_packed_object_sha1(p, revidx->nr);
-	} else
-		return NULL;
-}
-
-int unpack_object_header(struct packed_git *p,
-			 struct pack_window **w_curs,
-			 off_t *curpos,
-			 unsigned long *sizep)
-{
-	unsigned char *base;
-	unsigned long left;
-	unsigned long used;
-	enum object_type type;
-
-	/* use_pack() assures us we have [base, base + 20) available
-	 * as a range that we can look at.  (Its actually the hash
-	 * size that is assured.)  With our object header encoding
-	 * the maximum deflated object size is 2^137, which is just
-	 * insane, so we know won't exceed what we have been given.
-	 */
-	base = use_pack(p, w_curs, *curpos, &left);
-	used = unpack_object_header_buffer(base, left, &type, sizep);
-	if (!used) {
-		type = OBJ_BAD;
-	} else
-		*curpos += used;
-
-	return type;
-}
-
-static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
-{
-	int type;
-	struct revindex_entry *revidx;
-	const unsigned char *sha1;
-	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);
-	if (type <= OBJ_NONE)
-		return OBJ_BAD;
-	return type;
-}
-
-#define POI_STACK_PREALLOC 64
-
-static enum object_type packed_to_object_type(struct packed_git *p,
-					      off_t obj_offset,
-					      enum object_type type,
-					      struct pack_window **w_curs,
-					      off_t curpos)
-{
-	off_t small_poi_stack[POI_STACK_PREALLOC];
-	off_t *poi_stack = small_poi_stack;
-	int poi_stack_nr = 0, poi_stack_alloc = POI_STACK_PREALLOC;
-
-	while (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
-		off_t base_offset;
-		unsigned long size;
-		/* Push the object we're going to leave behind */
-		if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
-			poi_stack_alloc = alloc_nr(poi_stack_nr);
-			ALLOC_ARRAY(poi_stack, poi_stack_alloc);
-			memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr);
-		} else {
-			ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc);
-		}
-		poi_stack[poi_stack_nr++] = obj_offset;
-		/* If parsing the base offset fails, just unwind */
-		base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
-		if (!base_offset)
-			goto unwind;
-		curpos = obj_offset = base_offset;
-		type = unpack_object_header(p, w_curs, &curpos, &size);
-		if (type <= OBJ_NONE) {
-			/* If getting the base itself fails, we first
-			 * retry the base, otherwise unwind */
-			type = retry_bad_packed_offset(p, base_offset);
-			if (type > OBJ_NONE)
-				goto out;
-			goto unwind;
-		}
-	}
-
-	switch (type) {
-	case OBJ_BAD:
-	case OBJ_COMMIT:
-	case OBJ_TREE:
-	case OBJ_BLOB:
-	case OBJ_TAG:
-		break;
-	default:
-		error("unknown object type %i at offset %"PRIuMAX" in %s",
-		      type, (uintmax_t)obj_offset, p->pack_name);
-		type = OBJ_BAD;
-	}
-
-out:
-	if (poi_stack != small_poi_stack)
-		free(poi_stack);
-	return type;
-
-unwind:
-	while (poi_stack_nr) {
-		obj_offset = poi_stack[--poi_stack_nr];
-		type = retry_bad_packed_offset(p, obj_offset);
-		if (type > OBJ_NONE)
-			goto out;
-	}
-	type = OBJ_BAD;
-	goto out;
-}
-
-static struct hashmap delta_base_cache;
-static size_t delta_base_cached;
-
-static LIST_HEAD(delta_base_cache_lru);
-
-struct delta_base_cache_key {
-	struct packed_git *p;
-	off_t base_offset;
-};
-
-struct delta_base_cache_entry {
-	struct hashmap hash;
-	struct delta_base_cache_key key;
-	struct list_head lru;
-	void *data;
-	unsigned long size;
-	enum object_type type;
-};
-
-static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset)
-{
-	unsigned int hash;
-
-	hash = (unsigned int)(intptr_t)p + (unsigned int)base_offset;
-	hash += (hash >> 8) + (hash >> 16);
-	return hash;
-}
-
-static struct delta_base_cache_entry *
-get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
-{
-	struct hashmap_entry entry;
-	struct delta_base_cache_key key;
-
-	if (!delta_base_cache.cmpfn)
-		return NULL;
-
-	hashmap_entry_init(&entry, pack_entry_hash(p, base_offset));
-	key.p = p;
-	key.base_offset = base_offset;
-	return hashmap_get(&delta_base_cache, &entry, &key);
-}
-
-static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
-				   const struct delta_base_cache_key *b)
-{
-	return a->p == b->p && a->base_offset == b->base_offset;
-}
-
-static int delta_base_cache_hash_cmp(const void *unused_cmp_data,
-				     const void *va, const void *vb,
-				     const void *vkey)
-{
-	const struct delta_base_cache_entry *a = va, *b = vb;
-	const struct delta_base_cache_key *key = vkey;
-	if (key)
-		return !delta_base_cache_key_eq(&a->key, key);
-	else
-		return !delta_base_cache_key_eq(&a->key, &b->key);
-}
-
-static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
-{
-	return !!get_delta_base_cache_entry(p, base_offset);
-}
-
-/*
- * Remove the entry from the cache, but do _not_ free the associated
- * entry data. The caller takes ownership of the "data" buffer, and
- * should copy out any fields it wants before detaching.
- */
-static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)
-{
-	hashmap_remove(&delta_base_cache, ent, &ent->key);
-	list_del(&ent->lru);
-	delta_base_cached -= ent->size;
-	free(ent);
-}
-
-static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
-	unsigned long *base_size, enum object_type *type)
-{
-	struct delta_base_cache_entry *ent;
-
-	ent = get_delta_base_cache_entry(p, base_offset);
-	if (!ent)
-		return unpack_entry(p, base_offset, type, base_size);
-
-	if (type)
-		*type = ent->type;
-	if (base_size)
-		*base_size = ent->size;
-	return xmemdupz(ent->data, ent->size);
-}
-
-static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
-{
-	free(ent->data);
-	detach_delta_base_cache_entry(ent);
-}
-
-void clear_delta_base_cache(void)
-{
-	struct list_head *lru, *tmp;
-	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
-		struct delta_base_cache_entry *entry =
-			list_entry(lru, struct delta_base_cache_entry, lru);
-		release_delta_base_cache(entry);
-	}
-}
-
-static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
-	void *base, unsigned long base_size, enum object_type type)
-{
-	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
-	struct list_head *lru, *tmp;
-
-	delta_base_cached += base_size;
-
-	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
-		struct delta_base_cache_entry *f =
-			list_entry(lru, struct delta_base_cache_entry, lru);
-		if (delta_base_cached <= delta_base_cache_limit)
-			break;
-		release_delta_base_cache(f);
-	}
-
-	ent->key.p = p;
-	ent->key.base_offset = base_offset;
-	ent->type = type;
-	ent->data = base;
-	ent->size = base_size;
-	list_add_tail(&ent->lru, &delta_base_cache_lru);
-
-	if (!delta_base_cache.cmpfn)
-		hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0);
-	hashmap_entry_init(ent, pack_entry_hash(p, base_offset));
-	hashmap_add(&delta_base_cache, ent);
-}
-
-int packed_object_info(struct packed_git *p, off_t obj_offset,
-		       struct object_info *oi)
-{
-	struct pack_window *w_curs = NULL;
-	unsigned long size;
-	off_t curpos = obj_offset;
-	enum object_type type;
-
-	/*
-	 * We always get the representation type, but only convert it to
-	 * a "real" type later if the caller is interested.
-	 */
-	if (oi->contentp) {
-		*oi->contentp = cache_or_unpack_entry(p, obj_offset, oi->sizep,
-						      &type);
-		if (!*oi->contentp)
-			type = OBJ_BAD;
-	} else {
-		type = unpack_object_header(p, &w_curs, &curpos, &size);
-	}
-
-	if (!oi->contentp && oi->sizep) {
-		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
-			off_t tmp_pos = curpos;
-			off_t base_offset = get_delta_base(p, &w_curs, &tmp_pos,
-							   type, obj_offset);
-			if (!base_offset) {
-				type = OBJ_BAD;
-				goto out;
-			}
-			*oi->sizep = get_size_from_delta(p, &w_curs, tmp_pos);
-			if (*oi->sizep == 0) {
-				type = OBJ_BAD;
-				goto out;
-			}
-		} else {
-			*oi->sizep = size;
-		}
-	}
-
-	if (oi->disk_sizep) {
-		struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
-		*oi->disk_sizep = revidx[1].offset - obj_offset;
-	}
-
-	if (oi->typep || oi->typename) {
-		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 (tn)
-				strbuf_addstr(oi->typename, tn);
-		}
-		if (ptot < 0) {
-			type = OBJ_BAD;
-			goto out;
-		}
-	}
-
-	if (oi->delta_base_sha1) {
-		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
-			const unsigned char *base;
-
-			base = get_delta_base_sha1(p, &w_curs, curpos,
-						   type, obj_offset);
-			if (!base) {
-				type = OBJ_BAD;
-				goto out;
-			}
-
-			hashcpy(oi->delta_base_sha1, base);
-		} else
-			hashclr(oi->delta_base_sha1);
-	}
-
-out:
-	unuse_pack(&w_curs);
-	return type;
-}
-
-static void *unpack_compressed_entry(struct packed_git *p,
-				    struct pack_window **w_curs,
-				    off_t curpos,
-				    unsigned long size)
-{
-	int st;
-	git_zstream stream;
-	unsigned char *buffer, *in;
-
-	buffer = xmallocz_gently(size);
-	if (!buffer)
-		return NULL;
-	memset(&stream, 0, sizeof(stream));
-	stream.next_out = buffer;
-	stream.avail_out = size + 1;
-
-	git_inflate_init(&stream);
-	do {
-		in = use_pack(p, w_curs, curpos, &stream.avail_in);
-		stream.next_in = in;
-		st = git_inflate(&stream, Z_FINISH);
-		if (!stream.avail_out)
-			break; /* the payload is larger than it should be */
-		curpos += stream.next_in - in;
-	} while (st == Z_OK || st == Z_BUF_ERROR);
-	git_inflate_end(&stream);
-	if ((st != Z_STREAM_END) || stream.total_out != size) {
-		free(buffer);
-		return NULL;
-	}
-
-	return buffer;
-}
-
-static void *read_object(const unsigned char *sha1, enum object_type *type,
-			 unsigned long *size);
-
-static void write_pack_access_log(struct packed_git *p, off_t obj_offset)
-{
-	static struct trace_key pack_access = TRACE_KEY_INIT(PACK_ACCESS);
-	trace_printf_key(&pack_access, "%s %"PRIuMAX"\n",
-			 p->pack_name, (uintmax_t)obj_offset);
-}
-
-int do_check_packed_object_crc;
-
-#define UNPACK_ENTRY_STACK_PREALLOC 64
-struct unpack_entry_stack_ent {
-	off_t obj_offset;
-	off_t curpos;
-	unsigned long size;
-};
-
-void *unpack_entry(struct packed_git *p, off_t obj_offset,
-		   enum object_type *final_type, unsigned long *final_size)
-{
-	struct pack_window *w_curs = NULL;
-	off_t curpos = obj_offset;
-	void *data = NULL;
-	unsigned long size;
-	enum object_type type;
-	struct unpack_entry_stack_ent small_delta_stack[UNPACK_ENTRY_STACK_PREALLOC];
-	struct unpack_entry_stack_ent *delta_stack = small_delta_stack;
-	int delta_stack_nr = 0, delta_stack_alloc = UNPACK_ENTRY_STACK_PREALLOC;
-	int base_from_cache = 0;
-
-	write_pack_access_log(p, obj_offset);
-
-	/* PHASE 1: drill down to the innermost base object */
-	for (;;) {
-		off_t base_offset;
-		int i;
-		struct delta_base_cache_entry *ent;
-
-		ent = get_delta_base_cache_entry(p, curpos);
-		if (ent) {
-			type = ent->type;
-			data = ent->data;
-			size = ent->size;
-			detach_delta_base_cache_entry(ent);
-			base_from_cache = 1;
-			break;
-		}
-
-		if (do_check_packed_object_crc && p->index_version > 1) {
-			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);
-				error("bad packed object CRC for %s",
-				      sha1_to_hex(sha1));
-				mark_bad_packed_object(p, sha1);
-				data = NULL;
-				goto out;
-			}
-		}
-
-		type = unpack_object_header(p, &w_curs, &curpos, &size);
-		if (type != OBJ_OFS_DELTA && type != OBJ_REF_DELTA)
-			break;
-
-		base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
-		if (!base_offset) {
-			error("failed to validate delta base reference "
-			      "at offset %"PRIuMAX" from %s",
-			      (uintmax_t)curpos, p->pack_name);
-			/* bail to phase 2, in hopes of recovery */
-			data = NULL;
-			break;
-		}
-
-		/* push object, proceed to base */
-		if (delta_stack_nr >= delta_stack_alloc
-		    && delta_stack == small_delta_stack) {
-			delta_stack_alloc = alloc_nr(delta_stack_nr);
-			ALLOC_ARRAY(delta_stack, delta_stack_alloc);
-			memcpy(delta_stack, small_delta_stack,
-			       sizeof(*delta_stack)*delta_stack_nr);
-		} else {
-			ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
-		}
-		i = delta_stack_nr++;
-		delta_stack[i].obj_offset = obj_offset;
-		delta_stack[i].curpos = curpos;
-		delta_stack[i].size = size;
-
-		curpos = obj_offset = base_offset;
-	}
-
-	/* PHASE 2: handle the base */
-	switch (type) {
-	case OBJ_OFS_DELTA:
-	case OBJ_REF_DELTA:
-		if (data)
-			die("BUG: unpack_entry: left loop at a valid delta");
-		break;
-	case OBJ_COMMIT:
-	case OBJ_TREE:
-	case OBJ_BLOB:
-	case OBJ_TAG:
-		if (!base_from_cache)
-			data = unpack_compressed_entry(p, &w_curs, curpos, size);
-		break;
-	default:
-		data = NULL;
-		error("unknown object type %i at offset %"PRIuMAX" in %s",
-		      type, (uintmax_t)obj_offset, p->pack_name);
-	}
-
-	/* PHASE 3: apply deltas in order */
-
-	/* invariants:
-	 *   'data' holds the base data, or NULL if there was corruption
-	 */
-	while (delta_stack_nr) {
-		void *delta_data;
-		void *base = data;
-		void *external_base = NULL;
-		unsigned long delta_size, base_size = size;
-		int i;
-
-		data = NULL;
-
-		if (base)
-			add_delta_base_cache(p, obj_offset, base, base_size, type);
-
-		if (!base) {
-			/*
-			 * We're probably in deep shit, but let's try to fetch
-			 * the required base anyway from another pack or loose.
-			 * This is costly but should happen only in the presence
-			 * of a corrupted pack, and is better than failing outright.
-			 */
-			struct revindex_entry *revidx;
-			const unsigned char *base_sha1;
-			revidx = find_pack_revindex(p, obj_offset);
-			if (revidx) {
-				base_sha1 = nth_packed_object_sha1(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,
-				      p->pack_name);
-				mark_bad_packed_object(p, base_sha1);
-				base = read_object(base_sha1, &type, &base_size);
-				external_base = base;
-			}
-		}
-
-		i = --delta_stack_nr;
-		obj_offset = delta_stack[i].obj_offset;
-		curpos = delta_stack[i].curpos;
-		delta_size = delta_stack[i].size;
-
-		if (!base)
-			continue;
-
-		delta_data = unpack_compressed_entry(p, &w_curs, curpos, delta_size);
-
-		if (!delta_data) {
-			error("failed to unpack compressed delta "
-			      "at offset %"PRIuMAX" from %s",
-			      (uintmax_t)curpos, p->pack_name);
-			data = NULL;
-			free(external_base);
-			continue;
-		}
-
-		data = patch_delta(base, base_size,
-				   delta_data, delta_size,
-				   &size);
-
-		/*
-		 * We could not apply the delta; warn the user, but keep going.
-		 * Our failure will be noticed either in the next iteration of
-		 * the loop, or if this is the final delta, in the caller when
-		 * we return NULL. Those code paths will take care of making
-		 * a more explicit warning and retrying with another copy of
-		 * the object.
-		 */
-		if (!data)
-			error("failed to apply delta");
-
-		free(delta_data);
-		free(external_base);
-	}
-
-	if (final_type)
-		*final_type = type;
-	if (final_size)
-		*final_size = size;
-
-out:
-	unuse_pack(&w_curs);
-
-	if (delta_stack != small_delta_stack)
-		free(delta_stack);
-
-	return data;
-}
-
-const unsigned char *nth_packed_object_sha1(struct packed_git *p,
-					    uint32_t n)
-{
-	const unsigned char *index = p->index_data;
-	if (!index) {
-		if (open_pack_index(p))
-			return NULL;
-		index = p->index_data;
-	}
-	if (n >= p->num_objects)
-		return NULL;
-	index += 4 * 256;
-	if (p->index_version == 1) {
-		return index + 24 * n + 4;
-	} else {
-		index += 8;
-		return index + 20 * n;
-	}
-}
-
-const struct object_id *nth_packed_object_oid(struct object_id *oid,
-					      struct packed_git *p,
-					      uint32_t n)
-{
-	const unsigned char *hash = nth_packed_object_sha1(p, n);
-	if (!hash)
-		return NULL;
-	hashcpy(oid->hash, hash);
-	return oid;
-}
-
-void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
-{
-	const unsigned char *ptr = vptr;
-	const unsigned char *start = p->index_data;
-	const unsigned char *end = start + p->index_size;
-	if (ptr < start)
-		die(_("offset before start of pack index for %s (corrupt index?)"),
-		    p->pack_name);
-	/* No need to check for underflow; .idx files must be at least 8 bytes */
-	if (ptr >= end - 8)
-		die(_("offset beyond end of pack index for %s (truncated index?)"),
-		    p->pack_name);
-}
-
-off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
-{
-	const unsigned char *index = p->index_data;
-	index += 4 * 256;
-	if (p->index_version == 1) {
-		return ntohl(*((uint32_t *)(index + 24 * n)));
-	} else {
-		uint32_t off;
-		index += 8 + p->num_objects * (20 + 4);
-		off = ntohl(*((uint32_t *)(index + 4 * n)));
-		if (!(off & 0x80000000))
-			return off;
-		index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
-		check_pack_index_ptr(p, index);
-		return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) |
-				   ntohl(*((uint32_t *)(index + 4)));
-	}
-}
-
-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");
-
-	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) / 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;
-	}
-	return 0;
-}
-
-int is_pack_valid(struct packed_git *p)
-{
-	/* An already open pack is known to be valid. */
-	if (p->pack_fd != -1)
-		return 1;
-
-	/* If the pack has one window completely covering the
-	 * file size, the pack is known to be valid even if
-	 * the descriptor is not currently open.
-	 */
-	if (p->windows) {
-		struct pack_window *w = p->windows;
-
-		if (!w->offset && w->len == p->pack_size)
-			return 1;
-	}
-
-	/* Force the pack to open to prove its valid. */
-	return !open_packed_git(p);
-}
-
-static int fill_pack_entry(const unsigned char *sha1,
-			   struct pack_entry *e,
-			   struct packed_git *p)
-{
-	off_t offset;
-
-	if (p->num_bad_objects) {
-		unsigned i;
-		for (i = 0; i < p->num_bad_objects; i++)
-			if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
-				return 0;
-	}
-
-	offset = find_pack_entry_one(sha1, p);
-	if (!offset)
-		return 0;
-
-	/*
-	 * We are about to tell the caller where they can locate the
-	 * requested object.  We better make sure the packfile is
-	 * still here and can be accessed before supplying that
-	 * answer, as it may have been deleted since the index was
-	 * loaded!
-	 */
-	if (!is_pack_valid(p))
-		return 0;
-	e->offset = offset;
-	e->p = p;
-	hashcpy(e->sha1, sha1);
-	return 1;
-}
-
-/*
- * Iff a pack file contains the object named by sha1, return true and
- * store its location to e.
- */
-static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
-{
-	struct mru_entry *p;
-
-	prepare_packed_git();
-	if (!packed_git)
-		return 0;
-
-	for (p = packed_git_mru->head; p; p = p->next) {
-		if (fill_pack_entry(sha1, e, p->item)) {
-			mru_mark(packed_git_mru, p);
-			return 1;
-		}
-	}
-	return 0;
-}
-
-struct packed_git *find_sha1_pack(const unsigned char *sha1,
-				  struct packed_git *packs)
-{
-	struct packed_git *p;
-
-	for (p = packs; p; p = p->next) {
-		if (find_pack_entry_one(sha1, p))
-			return p;
-	}
-	return NULL;
-
-}
-
 static int sha1_loose_object_info(const unsigned char *sha1,
 				  struct object_info *oi,
 				  int flags)
@@ -2968,6 +1140,7 @@ static int sha1_loose_object_info(const unsigned char *sha1,
 	if (oi->sizep == &size_scratch)
 		oi->sizep = NULL;
 	strbuf_release(&hdrbuf);
+	oi->whence = OI_LOOSE;
 	return (status < 0) ? status : 0;
 }
 
@@ -3005,10 +1178,8 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 
 	if (!find_pack_entry(real, &e)) {
 		/* Most likely it's a loose object. */
-		if (!sha1_loose_object_info(real, oi, flags)) {
-			oi->whence = OI_LOOSE;
+		if (!sha1_loose_object_info(real, oi, flags))
 			return 0;
-		}
 
 		/* Not a loose object; someone else may have just packed it. */
 		if (flags & OBJECT_INFO_QUICK) {
@@ -3031,10 +1202,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 	if (rtype < 0) {
 		mark_bad_packed_object(e.p, real);
 		return sha1_object_info_extended(real, oi, 0);
-	} else if (in_delta_base_cache(e.p, e.offset)) {
-		oi->whence = OI_DBCACHED;
-	} else {
-		oi->whence = OI_PACKED;
+	} else if (oi->whence == OI_PACKED) {
 		oi->u.packed.offset = e.offset;
 		oi->u.packed.pack = e.p;
 		oi->u.packed.is_delta = (rtype == OBJ_REF_DELTA ||
@@ -3058,28 +1226,18 @@ int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
 	return type;
 }
 
-static void *read_packed_sha1(const unsigned char *sha1,
-			      enum object_type *type, unsigned long *size)
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+			 unsigned long *size)
 {
-	struct pack_entry e;
-	void *data;
+	struct object_info oi = OBJECT_INFO_INIT;
+	void *content;
+	oi.typep = type;
+	oi.sizep = size;
+	oi.contentp = &content;
 
-	if (!find_pack_entry(sha1, &e))
+	if (sha1_object_info_extended(sha1, &oi, 0) < 0)
 		return NULL;
-	data = cache_or_unpack_entry(e.p, e.offset, size, type);
-	if (!data) {
-		/*
-		 * We're probably in deep shit, but let's try to fetch
-		 * the required object anyway from another pack or loose.
-		 * This should happen only in the presence of a corrupted
-		 * pack, and is better than failing outright.
-		 */
-		error("failed to read object %s at offset %"PRIuMAX" from %s",
-		      sha1_to_hex(sha1), (uintmax_t)e.offset, e.p->pack_name);
-		mark_bad_packed_object(e.p, sha1);
-		data = read_object(sha1, type, size);
-	}
-	return data;
+	return content;
 }
 
 int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
@@ -3100,20 +1258,6 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
 	return 0;
 }
 
-static void *read_object(const unsigned char *sha1, enum object_type *type,
-			 unsigned long *size)
-{
-	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)
-		return NULL;
-	return content;
-}
-
 /*
  * This function dies on corrupt objects; the callers who want to
  * deal with them should arrange to call read_object() and give error
@@ -3432,7 +1576,7 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign
 }
 
 int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
-			     unsigned char *sha1, unsigned flags)
+			     struct object_id *oid, unsigned flags)
 {
 	char *header;
 	int hdrlen, status = 0;
@@ -3440,13 +1584,13 @@ int hash_sha1_file_literally(const void *buf, unsigned long len, const char *typ
 	/* type string, SP, %lu of the length plus NUL must fit this */
 	hdrlen = strlen(type) + 32;
 	header = xmalloc(hdrlen);
-	write_sha1_file_prepare(buf, len, type, sha1, header, &hdrlen);
+	write_sha1_file_prepare(buf, len, type, oid->hash, header, &hdrlen);
 
 	if (!(flags & HASH_WRITE_OBJECT))
 		goto cleanup;
-	if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
+	if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
 		goto cleanup;
-	status = write_loose_object(sha1, header, hdrlen, buf, len, 0);
+	status = write_loose_object(oid->hash, header, hdrlen, buf, len, 0);
 
 cleanup:
 	free(header);
@@ -3464,7 +1608,7 @@ int force_object_loose(const unsigned char *sha1, time_t mtime)
 
 	if (has_loose_object(sha1))
 		return 0;
-	buf = read_packed_sha1(sha1, &type, &len);
+	buf = read_object(sha1, &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;
@@ -3474,20 +1618,6 @@ int force_object_loose(const unsigned char *sha1, time_t mtime)
 	return ret;
 }
 
-int has_pack_index(const unsigned char *sha1)
-{
-	struct stat st;
-	if (stat(sha1_pack_index_name(sha1), &st))
-		return 0;
-	return 1;
-}
-
-int has_sha1_pack(const unsigned char *sha1)
-{
-	struct pack_entry e;
-	return find_pack_entry(sha1, &e);
-}
-
 int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
 {
 	if (!startup_info->have_repository)
@@ -3622,10 +1752,15 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
 		ret = index_mem(sha1, "", size, type, path, flags);
 	} else if (size <= SMALL_FILE_SIZE) {
 		char *buf = xmalloc(size);
-		if (size == read_in_full(fd, buf, size))
-			ret = index_mem(sha1, buf, size, type, path, flags);
+		ssize_t read_result = read_in_full(fd, buf, size);
+		if (read_result < 0)
+			ret = error_errno("read error while indexing %s",
+					  path ? path : "<unknown>");
+		else if (read_result != size)
+			ret = error("short read while indexing %s",
+				    path ? path : "<unknown>");
 		else
-			ret = error_errno("short read");
+			ret = index_mem(sha1, buf, size, type, path, flags);
 		free(buf);
 	} else {
 		void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -3650,14 +1785,14 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
  * binary blobs, they generally do not want to get any conversion, and
  * callers should avoid this code path when filters are requested.
  */
-static int index_stream(unsigned char *sha1, int fd, size_t size,
+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(sha1, fd, size, type, path, flags);
+	return index_bulk_checkin(oid->hash, fd, size, type, path, flags);
 }
 
-int index_fd(unsigned char *sha1, int fd, struct stat *st,
+int index_fd(struct object_id *oid, int fd, struct stat *st,
 	     enum object_type type, const char *path, unsigned flags)
 {
 	int ret;
@@ -3667,31 +1802,32 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,
 	 * die() for large files.
 	 */
 	if (type == OBJ_BLOB && path && would_convert_to_git_filter_fd(path))
-		ret = index_stream_convert_blob(sha1, fd, path, flags);
+		ret = index_stream_convert_blob(oid->hash, fd, path, flags);
 	else if (!S_ISREG(st->st_mode))
-		ret = index_pipe(sha1, fd, type, path, flags);
+		ret = index_pipe(oid->hash, fd, type, path, flags);
 	else if (st->st_size <= big_file_threshold || type != OBJ_BLOB ||
 		 (path && would_convert_to_git(&the_index, path)))
-		ret = index_core(sha1, fd, xsize_t(st->st_size), type, path,
+		ret = index_core(oid->hash, fd, xsize_t(st->st_size), type, path,
 				 flags);
 	else
-		ret = index_stream(sha1, fd, xsize_t(st->st_size), type, path,
+		ret = index_stream(oid, fd, xsize_t(st->st_size), type, path,
 				   flags);
 	close(fd);
 	return ret;
 }
 
-int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned flags)
+int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags)
 {
 	int fd;
 	struct strbuf sb = STRBUF_INIT;
+	int rc = 0;
 
 	switch (st->st_mode & S_IFMT) {
 	case S_IFREG:
 		fd = open(path, O_RDONLY);
 		if (fd < 0)
 			return error_errno("open(\"%s\")", path);
-		if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0)
+		if (index_fd(oid, fd, st, OBJ_BLOB, path, flags) < 0)
 			return error("%s: failed to insert into database",
 				     path);
 		break;
@@ -3699,23 +1835,22 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned
 		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, sha1);
-		else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1))
-			return error("%s: failed to insert into database",
-				     path);
+			hash_sha1_file(sb.buf, sb.len, blob_type, oid->hash);
+		else if (write_sha1_file(sb.buf, sb.len, blob_type, oid->hash))
+			rc = error("%s: failed to insert into database", path);
 		strbuf_release(&sb);
 		break;
 	case S_IFDIR:
-		return resolve_gitlink_ref(path, "HEAD", sha1);
+		return resolve_gitlink_ref(path, "HEAD", oid->hash);
 	default:
 		return error("%s: unsupported file type", path);
 	}
-	return 0;
+	return rc;
 }
 
 int read_pack_header(int fd, struct pack_header *header)
 {
-	if (read_in_full(fd, header, sizeof(*header)) < sizeof(*header))
+	if (read_in_full(fd, header, sizeof(*header)) != sizeof(*header))
 		/* "eof before pack header was fully read" */
 		return PH_ERROR_EOF;
 
@@ -3880,46 +2015,6 @@ int for_each_loose_object(each_loose_object_fn cb, void *data, unsigned flags)
 	return foreach_alt_odb(loose_from_alt_odb, &alt);
 }
 
-static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
-{
-	uint32_t i;
-	int r = 0;
-
-	for (i = 0; i < p->num_objects; i++) {
-		struct object_id oid;
-
-		if (!nth_packed_object_oid(&oid, p, i))
-			return error("unable to get sha1 of object %u in %s",
-				     i, p->pack_name);
-
-		r = cb(&oid, p, i, data);
-		if (r)
-			break;
-	}
-	return r;
-}
-
-int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
-{
-	struct packed_git *p;
-	int r = 0;
-	int pack_errors = 0;
-
-	prepare_packed_git();
-	for (p = packed_git; p; p = p->next) {
-		if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
-			continue;
-		if (open_pack_index(p)) {
-			pack_errors = 1;
-			continue;
-		}
-		r = for_each_object_in_pack(p, cb, data);
-		if (r)
-			break;
-	}
-	return r ? r : pack_errors;
-}
-
 static int check_stream_sha1(git_zstream *stream,
 			     const char *hdr,
 			     unsigned long size,
diff --git a/sha1_name.c b/sha1_name.c
index 74fcb6d78..c7c5ab376 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -9,8 +9,9 @@
 #include "remote.h"
 #include "dir.h"
 #include "sha1-array.h"
+#include "packfile.h"
 
-static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
+static int get_oid_oneline(const char *, struct object_id *, struct commit_list *);
 
 typedef int (*disambiguate_hint_fn)(const struct object_id *, void *);
 
@@ -156,7 +157,7 @@ static void unique_in_pack(struct packed_git *p,
 	num = p->num_objects;
 	last = num;
 	while (first < last) {
-		uint32_t mid = (first + last) / 2;
+		uint32_t mid = first + (last - first) / 2;
 		const unsigned char *current;
 		int cmp;
 
@@ -200,7 +201,7 @@ static void find_short_packed_object(struct disambiguate_state *ds)
 #define SHORT_NAME_AMBIGUOUS (-2)
 
 static int finish_object_disambiguation(struct disambiguate_state *ds,
-					unsigned char *sha1)
+					struct object_id *oid)
 {
 	if (ds->ambiguous)
 		return SHORT_NAME_AMBIGUOUS;
@@ -229,7 +230,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
 	if (!ds->candidate_ok)
 		return SHORT_NAME_AMBIGUOUS;
 
-	hashcpy(sha1, ds->candidate.hash);
+	oidcpy(oid, &ds->candidate);
 	return 0;
 }
 
@@ -385,35 +386,35 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
 	return 0;
 }
 
-static int get_short_sha1(const char *name, int len, unsigned char *sha1,
+static int get_short_oid(const char *name, int len, struct object_id *oid,
 			  unsigned flags)
 {
 	int status;
 	struct disambiguate_state ds;
-	int quietly = !!(flags & GET_SHA1_QUIETLY);
+	int quietly = !!(flags & GET_OID_QUIETLY);
 
 	if (init_object_disambiguation(name, len, &ds) < 0)
 		return -1;
 
-	if (HAS_MULTI_BITS(flags & GET_SHA1_DISAMBIGUATORS))
-		die("BUG: multiple get_short_sha1 disambiguator flags");
+	if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
+		die("BUG: multiple get_short_oid disambiguator flags");
 
-	if (flags & GET_SHA1_COMMIT)
+	if (flags & GET_OID_COMMIT)
 		ds.fn = disambiguate_commit_only;
-	else if (flags & GET_SHA1_COMMITTISH)
+	else if (flags & GET_OID_COMMITTISH)
 		ds.fn = disambiguate_committish_only;
-	else if (flags & GET_SHA1_TREE)
+	else if (flags & GET_OID_TREE)
 		ds.fn = disambiguate_tree_only;
-	else if (flags & GET_SHA1_TREEISH)
+	else if (flags & GET_OID_TREEISH)
 		ds.fn = disambiguate_treeish_only;
-	else if (flags & GET_SHA1_BLOB)
+	else if (flags & GET_OID_BLOB)
 		ds.fn = disambiguate_blob_only;
 	else
 		ds.fn = default_disambiguate_hint;
 
 	find_short_object_filename(&ds);
 	find_short_packed_object(&ds);
-	status = finish_object_disambiguation(&ds, sha1);
+	status = finish_object_disambiguation(&ds, oid);
 
 	if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
 		error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
@@ -500,12 +501,12 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
 	}
 
 	sha1_to_hex_r(hex, sha1);
-	if (len == 40 || !len)
-		return 40;
+	if (len == GIT_SHA1_HEXSZ || !len)
+		return GIT_SHA1_HEXSZ;
 	exists = has_sha1_file(sha1);
-	while (len < 40) {
-		unsigned char sha1_ret[20];
-		status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
+	while (len < GIT_SHA1_HEXSZ) {
+		struct object_id oid_ret;
+		status = get_short_oid(hex, len, &oid_ret, GET_OID_QUIETLY);
 		if (exists
 		    ? !status
 		    : status == SHORT_NAME_NOT_FOUND) {
@@ -578,10 +579,10 @@ static inline int push_mark(const char *string, int len)
 	return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
 }
 
-static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
+static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags);
 static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
 
-static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
+static int get_oid_basic(const char *str, int len, struct object_id *oid,
 			  unsigned int flags)
 {
 	static const char *warn_msg = "refname '%.*s' is ambiguous.";
@@ -595,14 +596,14 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 	"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
 	"examine these refs and maybe delete them. Turn this message off by\n"
 	"running \"git config advice.objectNameWarning false\"");
-	unsigned char tmp_sha1[20];
+	struct object_id tmp_oid;
 	char *real_ref = NULL;
 	int refs_found = 0;
 	int at, reflog_len, nth_prior = 0;
 
-	if (len == 40 && !get_sha1_hex(str, sha1)) {
+	if (len == GIT_SHA1_HEXSZ && !get_oid_hex(str, oid)) {
 		if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
-			refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
+			refs_found = dwim_ref(str, len, tmp_oid.hash, &real_ref);
 			if (refs_found > 0) {
 				warning(warn_msg, len, str);
 				if (advice_object_name_warning)
@@ -644,7 +645,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 		int detached;
 
 		if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
-			detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
+			detached = (buf.len == GIT_SHA1_HEXSZ && !get_oid_hex(buf.buf, oid));
 			strbuf_release(&buf);
 			if (detached)
 				return 0;
@@ -653,18 +654,18 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 
 	if (!len && reflog_len)
 		/* allow "@{...}" to mean the current branch reflog */
-		refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
+		refs_found = dwim_ref("HEAD", 4, oid->hash, &real_ref);
 	else if (reflog_len)
-		refs_found = dwim_log(str, len, sha1, &real_ref);
+		refs_found = dwim_log(str, len, oid->hash, &real_ref);
 	else
-		refs_found = dwim_ref(str, len, sha1, &real_ref);
+		refs_found = dwim_ref(str, len, oid->hash, &real_ref);
 
 	if (!refs_found)
 		return -1;
 
-	if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
+	if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
 	    (refs_found > 1 ||
-	     !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
+	     !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY)))
 		warning(warn_msg, len, str);
 
 	if (reflog_len) {
@@ -696,7 +697,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 				return -1;
 			}
 		}
-		if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
+		if (read_ref_at(real_ref, flags, at_time, nth, oid->hash, NULL,
 				&co_time, &co_tz, &co_cnt)) {
 			if (!len) {
 				if (starts_with(real_ref, "refs/heads/")) {
@@ -709,13 +710,13 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 				}
 			}
 			if (at_time) {
-				if (!(flags & GET_SHA1_QUIETLY)) {
+				if (!(flags & GET_OID_QUIETLY)) {
 					warning("Log for '%.*s' only goes "
 						"back to %s.", len, str,
 						show_date(co_time, co_tz, DATE_MODE(RFC2822)));
 				}
 			} else {
-				if (flags & GET_SHA1_QUIETLY) {
+				if (flags & GET_OID_QUIETLY) {
 					exit(128);
 				}
 				die("Log for '%.*s' only has %d entries.",
@@ -729,10 +730,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 }
 
 static int get_parent(const char *name, int len,
-		      unsigned char *result, int idx)
+		      struct object_id *result, int idx)
 {
 	struct object_id oid;
-	int ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
+	int ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
 	struct commit *commit;
 	struct commit_list *p;
 
@@ -742,13 +743,13 @@ static int get_parent(const char *name, int len,
 	if (parse_commit(commit))
 		return -1;
 	if (!idx) {
-		hashcpy(result, commit->object.oid.hash);
+		oidcpy(result, &commit->object.oid);
 		return 0;
 	}
 	p = commit->parents;
 	while (p) {
 		if (!--idx) {
-			hashcpy(result, p->item->object.oid.hash);
+			oidcpy(result, &p->item->object.oid);
 			return 0;
 		}
 		p = p->next;
@@ -757,13 +758,13 @@ static int get_parent(const char *name, int len,
 }
 
 static int get_nth_ancestor(const char *name, int len,
-			    unsigned char *result, int generation)
+			    struct object_id *result, int generation)
 {
 	struct object_id oid;
 	struct commit *commit;
 	int ret;
 
-	ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
+	ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
 	if (ret)
 		return ret;
 	commit = lookup_commit_reference(&oid);
@@ -775,7 +776,7 @@ static int get_nth_ancestor(const char *name, int len,
 			return -1;
 		commit = commit->parents->item;
 	}
-	hashcpy(result, commit->object.oid.hash);
+	oidcpy(result, &commit->object.oid);
 	return 0;
 }
 
@@ -804,7 +805,7 @@ struct object *peel_to_type(const char *name, int namelen,
 	}
 }
 
-static int peel_onion(const char *name, int len, unsigned char *sha1,
+static int peel_onion(const char *name, int len, struct object_id *oid,
 		      unsigned lookup_flags)
 {
 	struct object_id outer;
@@ -849,13 +850,13 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
 	else
 		return -1;
 
-	lookup_flags &= ~GET_SHA1_DISAMBIGUATORS;
+	lookup_flags &= ~GET_OID_DISAMBIGUATORS;
 	if (expected_type == OBJ_COMMIT)
-		lookup_flags |= GET_SHA1_COMMITTISH;
+		lookup_flags |= GET_OID_COMMITTISH;
 	else if (expected_type == OBJ_TREE)
-		lookup_flags |= GET_SHA1_TREEISH;
+		lookup_flags |= GET_OID_TREEISH;
 
-	if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags))
+	if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
 		return -1;
 
 	o = parse_object(&outer);
@@ -865,7 +866,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
 		o = deref_tag(o, name, sp - name - 2);
 		if (!o || (!o->parsed && !parse_object(&o->oid)))
 			return -1;
-		hashcpy(sha1, o->oid.hash);
+		oidcpy(oid, &o->oid);
 		return 0;
 	}
 
@@ -878,7 +879,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
 	if (!o)
 		return -1;
 
-	hashcpy(sha1, o->oid.hash);
+	oidcpy(oid, &o->oid);
 	if (sp[0] == '/') {
 		/* "$commit^{/foo}" */
 		char *prefix;
@@ -894,17 +895,17 @@ static int peel_onion(const char *name, int len, unsigned char *sha1,
 
 		prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
 		commit_list_insert((struct commit *)o, &list);
-		ret = get_sha1_oneline(prefix, sha1, list);
+		ret = get_oid_oneline(prefix, oid, list);
 		free(prefix);
 		return ret;
 	}
 	return 0;
 }
 
-static int get_describe_name(const char *name, int len, unsigned char *sha1)
+static int get_describe_name(const char *name, int len, struct object_id *oid)
 {
 	const char *cp;
-	unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
+	unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
 
 	for (cp = name + len - 1; name + 2 <= cp; cp--) {
 		char ch = *cp;
@@ -915,14 +916,14 @@ static int get_describe_name(const char *name, int len, unsigned char *sha1)
 			if (ch == 'g' && cp[-1] == '-') {
 				cp++;
 				len -= cp - name;
-				return get_short_sha1(cp, len, sha1, flags);
+				return get_short_oid(cp, len, oid, flags);
 			}
 		}
 	}
 	return -1;
 }
 
-static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
+static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags)
 {
 	int ret, has_suffix;
 	const char *cp;
@@ -949,25 +950,25 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned l
 		if (!num && len1 == len - 1)
 			num = 1;
 		if (has_suffix == '^')
-			return get_parent(name, len1, sha1, num);
+			return get_parent(name, len1, oid, num);
 		/* else if (has_suffix == '~') -- goes without saying */
-		return get_nth_ancestor(name, len1, sha1, num);
+		return get_nth_ancestor(name, len1, oid, num);
 	}
 
-	ret = peel_onion(name, len, sha1, lookup_flags);
+	ret = peel_onion(name, len, oid, lookup_flags);
 	if (!ret)
 		return 0;
 
-	ret = get_sha1_basic(name, len, sha1, lookup_flags);
+	ret = get_oid_basic(name, len, oid, lookup_flags);
 	if (!ret)
 		return 0;
 
 	/* It could be describe output that is "SOMETHING-gXXXX" */
-	ret = get_describe_name(name, len, sha1);
+	ret = get_describe_name(name, len, oid);
 	if (!ret)
 		return 0;
 
-	return get_short_sha1(name, len, sha1, lookup_flags);
+	return get_short_oid(name, len, oid, lookup_flags);
 }
 
 /*
@@ -1004,7 +1005,7 @@ static int handle_one_ref(const char *path, const struct object_id *oid,
 	return 0;
 }
 
-static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
+static int get_oid_oneline(const char *prefix, struct object_id *oid,
 			    struct commit_list *list)
 {
 	struct commit_list *backup = NULL, *l;
@@ -1044,7 +1045,7 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
 		unuse_commit_buffer(commit, buf);
 
 		if (matches) {
-			hashcpy(sha1, commit->object.oid.hash);
+			oidcpy(oid, &commit->object.oid);
 			found = 1;
 			break;
 		}
@@ -1140,7 +1141,7 @@ int get_oid_mb(const char *name, struct object_id *oid)
 		struct strbuf sb;
 		strbuf_init(&sb, dots - name);
 		strbuf_add(&sb, name, dots - name);
-		st = get_sha1_committish(sb.buf, oid_tmp.hash);
+		st = get_oid_committish(sb.buf, &oid_tmp);
 		strbuf_release(&sb);
 	}
 	if (st)
@@ -1149,7 +1150,7 @@ int get_oid_mb(const char *name, struct object_id *oid)
 	if (!one)
 		return -1;
 
-	if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", oid_tmp.hash))
+	if (get_oid_committish(dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
 		return -1;
 	two = lookup_commit_reference_gently(&oid_tmp, 0);
 	if (!two)
@@ -1338,21 +1339,13 @@ int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
 }
 
 /*
- * This is like "get_sha1_basic()", except it allows "sha1 expressions",
+ * This is like "get_oid_basic()", except it allows "object ID expressions",
  * notably "xyz^" for "parent of xyz"
  */
-int get_sha1(const char *name, unsigned char *sha1)
-{
-	struct object_context unused;
-	return get_sha1_with_context(name, 0, sha1, &unused);
-}
-
-/*
- * This is like "get_sha1()", but for struct object_id.
- */
 int get_oid(const char *name, struct object_id *oid)
 {
-	return get_sha1(name, oid->hash);
+	struct object_context unused;
+	return get_oid_with_context(name, 0, oid, &unused);
 }
 
 
@@ -1366,49 +1359,49 @@ int get_oid(const char *name, struct object_id *oid)
  * commit-ish. It is merely to give a hint to the disambiguation
  * machinery.
  */
-int get_sha1_committish(const char *name, unsigned char *sha1)
+int get_oid_committish(const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
-				     sha1, &unused);
+	return get_oid_with_context(name, GET_OID_COMMITTISH,
+				    oid, &unused);
 }
 
-int get_sha1_treeish(const char *name, unsigned char *sha1)
+int get_oid_treeish(const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_sha1_with_context(name, GET_SHA1_TREEISH,
-				     sha1, &unused);
+	return get_oid_with_context(name, GET_OID_TREEISH,
+				    oid, &unused);
 }
 
-int get_sha1_commit(const char *name, unsigned char *sha1)
+int get_oid_commit(const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_sha1_with_context(name, GET_SHA1_COMMIT,
-				     sha1, &unused);
+	return get_oid_with_context(name, GET_OID_COMMIT,
+				    oid, &unused);
 }
 
-int get_sha1_tree(const char *name, unsigned char *sha1)
+int get_oid_tree(const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_sha1_with_context(name, GET_SHA1_TREE,
-				     sha1, &unused);
+	return get_oid_with_context(name, GET_OID_TREE,
+				    oid, &unused);
 }
 
-int get_sha1_blob(const char *name, unsigned char *sha1)
+int get_oid_blob(const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_sha1_with_context(name, GET_SHA1_BLOB,
-				     sha1, &unused);
+	return get_oid_with_context(name, GET_OID_BLOB,
+				    oid, &unused);
 }
 
 /* Must be called only when object_name:filename doesn't exist. */
-static void diagnose_invalid_sha1_path(const char *prefix,
-				       const char *filename,
-				       const unsigned char *tree_sha1,
-				       const char *object_name,
-				       int object_name_len)
+static void diagnose_invalid_oid_path(const char *prefix,
+				      const char *filename,
+				      const struct object_id *tree_oid,
+				      const char *object_name,
+				      int object_name_len)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	unsigned mode;
 
 	if (!prefix)
@@ -1420,8 +1413,8 @@ static void diagnose_invalid_sha1_path(const char *prefix,
 	if (is_missing_file_error(errno)) {
 		char *fullname = xstrfmt("%s%s", prefix, filename);
 
-		if (!get_tree_entry(tree_sha1, fullname,
-				    sha1, &mode)) {
+		if (!get_tree_entry(tree_oid->hash, fullname,
+				    oid.hash, &mode)) {
 			die("Path '%s' exists, but not '%s'.\n"
 			    "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
 			    fullname,
@@ -1504,24 +1497,24 @@ static char *resolve_relative_path(const char *rel)
 			   rel);
 }
 
-static int get_sha1_with_context_1(const char *name,
-				   unsigned flags,
-				   const char *prefix,
-				   unsigned char *sha1,
-				   struct object_context *oc)
+static int get_oid_with_context_1(const char *name,
+				  unsigned flags,
+				  const char *prefix,
+				  struct object_id *oid,
+				  struct object_context *oc)
 {
 	int ret, bracket_depth;
 	int namelen = strlen(name);
 	const char *cp;
-	int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
+	int only_to_die = flags & GET_OID_ONLY_TO_DIE;
 
 	if (only_to_die)
-		flags |= GET_SHA1_QUIETLY;
+		flags |= GET_OID_QUIETLY;
 
 	memset(oc, 0, sizeof(*oc));
 	oc->mode = S_IFINVALID;
 	strbuf_init(&oc->symlink_path, 0);
-	ret = get_sha1_1(name, namelen, sha1, flags);
+	ret = get_oid_1(name, namelen, oid, flags);
 	if (!ret)
 		return ret;
 	/*
@@ -1541,7 +1534,7 @@ static int get_sha1_with_context_1(const char *name,
 
 			for_each_ref(handle_one_ref, &list);
 			commit_list_sort_by_date(&list);
-			return get_sha1_oneline(name + 2, sha1, list);
+			return get_oid_oneline(name + 2, oid, list);
 		}
 		if (namelen < 3 ||
 		    name[2] != ':' ||
@@ -1559,7 +1552,7 @@ static int get_sha1_with_context_1(const char *name,
 			namelen = strlen(cp);
 		}
 
-		if (flags & GET_SHA1_RECORD_PATH)
+		if (flags & GET_OID_RECORD_PATH)
 			oc->path = xstrdup(cp);
 
 		if (!active_cache)
@@ -1573,7 +1566,7 @@ static int get_sha1_with_context_1(const char *name,
 			    memcmp(ce->name, cp, namelen))
 				break;
 			if (ce_stage(ce) == stage) {
-				hashcpy(sha1, ce->oid.hash);
+				oidcpy(oid, &ce->oid);
 				oc->mode = ce->ce_mode;
 				free(new_path);
 				return 0;
@@ -1594,36 +1587,36 @@ static int get_sha1_with_context_1(const char *name,
 			break;
 	}
 	if (*cp == ':') {
-		unsigned char tree_sha1[20];
+		struct object_id tree_oid;
 		int len = cp - name;
 		unsigned sub_flags = flags;
 
-		sub_flags &= ~GET_SHA1_DISAMBIGUATORS;
-		sub_flags |= GET_SHA1_TREEISH;
+		sub_flags &= ~GET_OID_DISAMBIGUATORS;
+		sub_flags |= GET_OID_TREEISH;
 
-		if (!get_sha1_1(name, len, tree_sha1, sub_flags)) {
+		if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
 			const char *filename = cp+1;
 			char *new_filename = NULL;
 
 			new_filename = resolve_relative_path(filename);
 			if (new_filename)
 				filename = new_filename;
-			if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
-				ret = get_tree_entry_follow_symlinks(tree_sha1,
-					filename, sha1, &oc->symlink_path,
+			if (flags & GET_OID_FOLLOW_SYMLINKS) {
+				ret = get_tree_entry_follow_symlinks(tree_oid.hash,
+					filename, oid->hash, &oc->symlink_path,
 					&oc->mode);
 			} else {
-				ret = get_tree_entry(tree_sha1, filename,
-						     sha1, &oc->mode);
+				ret = get_tree_entry(tree_oid.hash, filename,
+						     oid->hash, &oc->mode);
 				if (ret && only_to_die) {
-					diagnose_invalid_sha1_path(prefix,
+					diagnose_invalid_oid_path(prefix,
 								   filename,
-								   tree_sha1,
+								   &tree_oid,
 								   name, len);
 				}
 			}
-			hashcpy(oc->tree, tree_sha1);
-			if (flags & GET_SHA1_RECORD_PATH)
+			hashcpy(oc->tree, tree_oid.hash);
+			if (flags & GET_OID_RECORD_PATH)
 				oc->path = xstrdup(filename);
 
 			free(new_filename);
@@ -1646,13 +1639,13 @@ static int get_sha1_with_context_1(const char *name,
 void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
 {
 	struct object_context oc;
-	unsigned char sha1[20];
-	get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
+	struct object_id oid;
+	get_oid_with_context_1(name, GET_OID_ONLY_TO_DIE, prefix, &oid, &oc);
 }
 
-int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc)
+int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc)
 {
-	if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
+	if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
 		die("BUG: incompatible flags for get_sha1_with_context");
-	return get_sha1_with_context_1(str, flags, NULL, sha1, oc);
+	return get_oid_with_context_1(str, flags, NULL, oid, oc);
 }
diff --git a/sha1dc_git.c b/sha1dc_git.c
index 4d32b4f77..e0cc9d988 100644
--- a/sha1dc_git.c
+++ b/sha1dc_git.c
@@ -1,8 +1,19 @@
+#include "cache.h"
+
+#ifdef DC_SHA1_EXTERNAL
 /*
- * This code is included at the end of sha1dc/sha1.c with the
- * SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_C macro.
+ * Same as SHA1DCInit, but with default save_hash=0
  */
+void git_SHA1DCInit(SHA1_CTX *ctx)
+{
+	SHA1DCInit(ctx);
+	SHA1DCSetSafeHash(ctx, 0);
+}
+#endif
 
+/*
+ * Same as SHA1DCFinal, but convert collision attack case into a verbose die().
+ */
 void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
 {
 	if (!SHA1DCFinal(hash, ctx))
@@ -11,6 +22,9 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
 	    sha1_to_hex(hash));
 }
 
+/*
+ * Same as SHA1DCUpdate, but adjust types to match git's usual interface.
+ */
 void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len)
 {
 	const char *data = vdata;
diff --git a/sha1dc_git.h b/sha1dc_git.h
index a8a5c1da1..a8c272927 100644
--- a/sha1dc_git.h
+++ b/sha1dc_git.h
@@ -1,19 +1,23 @@
-/*
- * This code is included at the end of sha1dc/sha1.h with the
- * SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_H macro.
- */
+/* Plumbing with collition-detecting SHA1 code */
 
-/*
- * Same as SHA1DCFinal, but convert collision attack case into a verbose die().
- */
-void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);
+#ifdef DC_SHA1_SUBMODULE
+#include "sha1collisiondetection/lib/sha1.h"
+#elif defined(DC_SHA1_EXTERNAL)
+#include <sha1dc/sha1.h>
+#else
+#include "sha1dc/sha1.h"
+#endif
+
+#ifdef DC_SHA1_EXTERNAL
+void git_SHA1DCInit(SHA1_CTX *);
+#else
+#define git_SHA1DCInit	SHA1DCInit
+#endif
 
-/*
- * Same as SHA1DCUpdate, but adjust types to match git's usual interface.
- */
+void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);
 void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len);
 
 #define platform_SHA_CTX SHA1_CTX
-#define platform_SHA1_Init SHA1DCInit
+#define platform_SHA1_Init git_SHA1DCInit
 #define platform_SHA1_Update git_SHA1DCUpdate
 #define platform_SHA1_Final git_SHA1DCFinal
diff --git a/shallow.c b/shallow.c
index 54359d549..df4d44ea7 100644
--- a/shallow.c
+++ b/shallow.c
@@ -99,7 +99,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 				cur_depth = 0;
 			} else {
 				commit = (struct commit *)
-					stack.objects[--stack.nr].item;
+					object_array_pop(&stack);
 				cur_depth = *(int *)commit->util;
 			}
 		}
@@ -107,7 +107,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 		cur_depth++;
 		if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
 		    (is_repository_shallow() && !commit->parents &&
-		     (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL &&
+		     (graft = lookup_commit_graft(&commit->object.oid)) != NULL &&
 		     graft->nr_parent < 0)) {
 			commit_list_insert(commit, &result);
 			commit->object.flags |= shallow_flag;
@@ -286,28 +286,26 @@ int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
 	return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
 }
 
-static struct tempfile temporary_shallow;
-
 const char *setup_temporary_shallow(const struct oid_array *extra)
 {
+	struct tempfile *temp;
 	struct strbuf sb = STRBUF_INIT;
-	int fd;
 
 	if (write_shallow_commits(&sb, 0, extra)) {
-		fd = xmks_tempfile(&temporary_shallow, git_path("shallow_XXXXXX"));
+		temp = xmks_tempfile(git_path("shallow_XXXXXX"));
 
-		if (write_in_full(fd, sb.buf, sb.len) != sb.len)
+		if (write_in_full(temp->fd, sb.buf, sb.len) < 0 ||
+		    close_tempfile_gently(temp) < 0)
 			die_errno("failed to write to %s",
-				  get_tempfile_path(&temporary_shallow));
-		close_tempfile(&temporary_shallow);
+				  get_tempfile_path(temp));
 		strbuf_release(&sb);
-		return get_tempfile_path(&temporary_shallow);
+		return get_tempfile_path(temp);
 	}
 	/*
 	 * is_repository_shallow() sees empty string as "no shallow
 	 * file".
 	 */
-	return get_tempfile_path(&temporary_shallow);
+	return "";
 }
 
 void setup_alternate_shallow(struct lock_file *shallow_lock,
@@ -321,7 +319,7 @@ void setup_alternate_shallow(struct lock_file *shallow_lock,
 				       LOCK_DIE_ON_ERROR);
 	check_shallow_file_for_update();
 	if (write_shallow_commits(&sb, 0, extra)) {
-		if (write_in_full(fd, sb.buf, sb.len) != sb.len)
+		if (write_in_full(fd, sb.buf, sb.len) < 0)
 			die_errno("failed to write to %s",
 				  get_lock_file_path(shallow_lock));
 		*alternate_shallow_file = get_lock_file_path(shallow_lock);
@@ -368,7 +366,7 @@ void prune_shallow(int show_only)
 				       LOCK_DIE_ON_ERROR);
 	check_shallow_file_for_update();
 	if (write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY)) {
-		if (write_in_full(fd, sb.buf, sb.len) != sb.len)
+		if (write_in_full(fd, sb.buf, sb.len) < 0)
 			die_errno("failed to write to %s",
 				  get_lock_file_path(&shallow_lock));
 		commit_lock_file(&shallow_lock);
@@ -398,7 +396,7 @@ void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa)
 	for (i = 0; i < sa->nr; i++) {
 		if (has_object_file(sa->oid + i)) {
 			struct commit_graft *graft;
-			graft = lookup_commit_graft(sa->oid[i].hash);
+			graft = lookup_commit_graft(&sa->oid[i]);
 			if (graft && graft->nr_parent < 0)
 				continue;
 			info->ours[info->nr_ours++] = i;
diff --git a/strbuf.h b/strbuf.h
index 80112a8c2..0a74acb23 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -68,7 +68,7 @@ struct strbuf {
 };
 
 extern char strbuf_slopbuf[];
-#define STRBUF_INIT  { 0, 0, strbuf_slopbuf }
+#define STRBUF_INIT  { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
 
 /**
  * Life Cycle Functions
@@ -154,7 +154,10 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len)
 	if (len > (sb->alloc ? sb->alloc - 1 : 0))
 		die("BUG: strbuf_setlen() beyond buffer");
 	sb->len = len;
-	sb->buf[len] = '\0';
+	if (sb->buf != strbuf_slopbuf)
+		sb->buf[len] = '\0';
+	else
+		assert(!strbuf_slopbuf[0]);
 }
 
 /**
diff --git a/streaming.c b/streaming.c
index 9afa66b8b..5892b50bd 100644
--- a/streaming.c
+++ b/streaming.c
@@ -3,6 +3,7 @@
  */
 #include "cache.h"
 #include "streaming.h"
+#include "packfile.h"
 
 enum input_source {
 	stream_error = -1,
@@ -539,7 +540,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
 			kept = 0;
 		wrote = write_in_full(fd, buf, readlen);
 
-		if (wrote != readlen)
+		if (wrote < 0)
 			goto close_and_exit;
 	}
 	if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||
diff --git a/string-list.c b/string-list.c
index 806b4c872..a0cf0cfe8 100644
--- a/string-list.c
+++ b/string-list.c
@@ -16,7 +16,7 @@ static int get_entry_index(const struct string_list *list, const char *string,
 	compare_strings_fn cmp = list->cmp ? list->cmp : strcmp;
 
 	while (left + 1 < right) {
-		int middle = (left + right) / 2;
+		int middle = left + (right - left) / 2;
 		int compare = cmp(string, list->items[middle].string);
 		if (compare < 0)
 			right = middle;
diff --git a/string-list.h b/string-list.h
index 79ae567cb..ff8f6094a 100644
--- a/string-list.h
+++ b/string-list.h
@@ -1,6 +1,69 @@
 #ifndef STRING_LIST_H
 #define STRING_LIST_H
 
+/**
+ * The string_list API offers a data structure and functions to handle
+ * sorted and unsorted arrays of strings.  A "sorted" list is one whose
+ * entries are sorted by string value in `strcmp()` order.
+ *
+ * The caller:
+ *
+ * . Allocates and clears a `struct string_list` variable.
+ *
+ * . Initializes the members. You might want to set the flag `strdup_strings`
+ *   if the strings should be strdup()ed. For example, this is necessary
+ *   when you add something like git_path("..."), since that function returns
+ *   a static buffer that will change with the next call to git_path().
+ *
+ * If you need something advanced, you can manually malloc() the `items`
+ * member (you need this if you add things later) and you should set the
+ * `nr` and `alloc` members in that case, too.
+ *
+ * . Adds new items to the list, using `string_list_append`,
+ *   `string_list_append_nodup`, `string_list_insert`,
+ *   `string_list_split`, and/or `string_list_split_in_place`.
+ *
+ * . Can check if a string is in the list using `string_list_has_string` or
+ *   `unsorted_string_list_has_string` and get it from the list using
+ *   `string_list_lookup` for sorted lists.
+ *
+ * . Can sort an unsorted list using `string_list_sort`.
+ *
+ * . Can remove duplicate items from a sorted list using
+ *   `string_list_remove_duplicates`.
+ *
+ * . Can remove individual items of an unsorted list using
+ *   `unsorted_string_list_delete_item`.
+ *
+ * . Can remove items not matching a criterion from a sorted or unsorted
+ *   list using `filter_string_list`, or remove empty strings using
+ *   `string_list_remove_empty_items`.
+ *
+ * . Finally it should free the list using `string_list_clear`.
+ *
+ * Example:
+ *
+ *     struct string_list list = STRING_LIST_INIT_NODUP;
+ *     int i;
+ *
+ *     string_list_append(&list, "foo");
+ *     string_list_append(&list, "bar");
+ *     for (i = 0; i < list.nr; i++)
+ *             printf("%s\n", list.items[i].string)
+ *
+ * NOTE: It is more efficient to build an unsorted list and sort it
+ * afterwards, instead of building a sorted list (`O(n log n)` instead of
+ * `O(n^2)`).
+ *
+ * However, if you use the list to check if a certain string was added
+ * already, you should not do that (using unsorted_string_list_has_string()),
+ * because the complexity would be quadratic again (but with a worse factor).
+ */
+
+/**
+ * Represents an item of the list. The `string` member is a pointer to the
+ * string, and you may use the `util` member for any purpose, if you want.
+ */
 struct string_list_item {
 	char *string;
 	void *util;
@@ -8,6 +71,18 @@ struct string_list_item {
 
 typedef int (*compare_strings_fn)(const char *, const char *);
 
+/**
+ * Represents the list itself.
+ *
+ * . The array of items are available via the `items` member.
+ * . The `nr` member contains the number of items stored in the list.
+ * . The `alloc` member is used to avoid reallocating at every insertion.
+ *   You should not tamper with it.
+ * . Setting the `strdup_strings` member to 1 will strdup() the strings
+ *   before adding them, see above.
+ * . The `compare_strings_fn` member is used to specify a custom compare
+ *   function, otherwise `strcmp()` is used as the default function.
+ */
 struct string_list {
 	struct string_list_item *items;
 	unsigned int nr, alloc;
@@ -18,35 +93,65 @@ struct string_list {
 #define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
 #define STRING_LIST_INIT_DUP   { NULL, 0, 0, 1, NULL }
 
+/* General functions which work with both sorted and unsorted lists. */
+
+/**
+ * Initialize the members of the string_list, set `strdup_strings`
+ * member according to the value of the second parameter.
+ */
 void string_list_init(struct string_list *list, int strdup_strings);
 
+/** Callback function type for for_each_string_list */
+typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
+
+/**
+ * Apply `want` to each item in `list`, retaining only the ones for which
+ * the function returns true.  If `free_util` is true, call free() on
+ * the util members of any items that have to be deleted.  Preserve
+ * the order of the items that are retained.
+ */
+void filter_string_list(struct string_list *list, int free_util,
+			string_list_each_func_t want, void *cb_data);
+
+/**
+ * Dump a string_list to stdout, useful mainly for debugging
+ * purposes. It can take an optional header argument and it writes out
+ * the string-pointer pairs of the string_list, each one in its own
+ * line.
+ */
 void print_string_list(const struct string_list *p, const char *text);
+
+/**
+ * Free a string_list. The `string` pointer of the items will be freed
+ * in case the `strdup_strings` member of the string_list is set. The
+ * second parameter controls if the `util` pointer of the items should
+ * be freed or not.
+ */
 void string_list_clear(struct string_list *list, int free_util);
 
-/* Use this function to call a custom clear function on each util pointer */
-/* The string associated with the util pointer is passed as the second argument */
+/**
+ * Callback type for `string_list_clear_func`.  The string associated
+ * with the util pointer is passed as the second argument
+ */
 typedef void (*string_list_clear_func_t)(void *p, const char *str);
+
+/** Call a custom clear function on each util pointer */
 void string_list_clear_func(struct string_list *list, string_list_clear_func_t clearfunc);
 
-/* Use this function or the macro below to iterate over each item */
-typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
+/**
+ * Apply `func` to each item. If `func` returns nonzero, the
+ * iteration aborts and the return value is propagated.
+ */
 int for_each_string_list(struct string_list *list,
-			 string_list_each_func_t, void *cb_data);
+			 string_list_each_func_t func, void *cb_data);
+
+/** Iterate over each item, as a macro. */
 #define for_each_string_list_item(item,list)            \
 	for (item = (list)->items;                      \
 	     item && item < (list)->items + (list)->nr; \
 	     ++item)
 
-/*
- * Apply want to each item in list, retaining only the ones for which
- * the function returns true.  If free_util is true, call free() on
- * the util members of any items that have to be deleted.  Preserve
- * the order of the items that are retained.
- */
-void filter_string_list(struct string_list *list, int free_util,
-			string_list_each_func_t want, void *cb_data);
-
-/*
+/**
  * Remove any empty strings from the list.  If free_util is true, call
  * free() on the util members of any items that have to be deleted.
  * Preserve the order of the items that are retained.
@@ -54,25 +159,34 @@ void filter_string_list(struct string_list *list, int free_util,
 void string_list_remove_empty_items(struct string_list *list, int free_util);
 
 /* Use these functions only on sorted lists: */
+
+/** Determine if the string_list has a given string or not. */
 int string_list_has_string(const struct string_list *list, const char *string);
 int string_list_find_insert_index(const struct string_list *list, const char *string,
 				  int negative_existing_index);
-/*
- * Inserts the given string into the sorted list.
- * If the string already exists, the list is not altered.
- * Returns the string_list_item, the string is part of.
+
+/**
+ * Insert a new element to the string_list. The returned pointer can
+ * be handy if you want to write something to the `util` pointer of
+ * the string_list_item containing the just added string. If the given
+ * string already exists the insertion will be skipped and the pointer
+ * to the existing item returned.
+ *
+ * Since this function uses xrealloc() (which die()s if it fails) if the
+ * list needs to grow, it is safe not to check the pointer. I.e. you may
+ * write `string_list_insert(...)->util = ...;`.
  */
 struct string_list_item *string_list_insert(struct string_list *list, const char *string);
 
-/*
- * Removes the given string from the sorted list.
- * If the string doesn't exist, the list is not altered.
+/**
+ * Remove the given string from the sorted list.  If the string
+ * doesn't exist, the list is not altered.
  */
 extern void string_list_remove(struct string_list *list, const char *string,
 			       int free_util);
 
-/*
- * Checks if the given string is part of a sorted list. If it is part of the list,
+/**
+ * Check if the given string is part of a sorted list. If it is part of the list,
  * return the coresponding string_list_item, NULL otherwise.
  */
 struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
@@ -87,14 +201,14 @@ void string_list_remove_duplicates(struct string_list *sorted_list, int free_uti
 
 /* Use these functions only on unsorted lists: */
 
-/*
+/**
  * Add string to the end of list.  If list->strdup_string is set, then
  * string is copied; otherwise the new string_list_entry refers to the
  * input string.
  */
 struct string_list_item *string_list_append(struct string_list *list, const char *string);
 
-/*
+/**
  * Like string_list_append(), except string is never copied.  When
  * list->strdup_strings is set, this function can be used to hand
  * ownership of a malloc()ed string to list without making an extra
@@ -102,16 +216,34 @@ struct string_list_item *string_list_append(struct string_list *list, const char
  */
 struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
 
+/**
+ * Sort the list's entries by string value in `strcmp()` order.
+ */
 void string_list_sort(struct string_list *list);
+
+/**
+ * Like `string_list_has_string()` but for unsorted lists. Linear in
+ * size of the list.
+ */
 int unsorted_string_list_has_string(struct string_list *list, const char *string);
+
+/**
+ * Like `string_list_lookup()` but for unsorted lists. Linear in size
+ * of the list.
+ */
 struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
 						     const char *string);
-
+/**
+ * Remove an item from a string_list. The `string` pointer of the
+ * items will be freed in case the `strdup_strings` member of the
+ * string_list is set. The third parameter controls if the `util`
+ * pointer of the items should be freed or not.
+ */
 void unsorted_string_list_delete_item(struct string_list *list, int i, int free_util);
 
-/*
- * Split string into substrings on character delim and append the
- * substrings to list.  The input string is not modified.
+/**
+ * Split string into substrings on character `delim` and append the
+ * substrings to `list`.  The input string is not modified.
  * list->strdup_strings must be set, as new memory needs to be
  * allocated to hold the substrings.  If maxsplit is non-negative,
  * then split at most maxsplit times.  Return the number of substrings
diff --git a/sub-process.c b/sub-process.c
index 80571567f..8d2a1707c 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -6,10 +6,13 @@
 #include "pkt-line.h"
 
 int cmd2process_cmp(const void *unused_cmp_data,
-		    const struct subprocess_entry *e1,
-		    const struct subprocess_entry *e2,
+		    const void *entry,
+		    const void *entry_or_key,
 		    const void *unused_keydata)
 {
+	const struct subprocess_entry *e1 = entry;
+	const struct subprocess_entry *e2 = entry_or_key;
+
 	return strcmp(e1->cmd, e2->cmd);
 }
 
diff --git a/sub-process.h b/sub-process.h
index caa91a9b9..49701998c 100644
--- a/sub-process.h
+++ b/sub-process.h
@@ -43,8 +43,8 @@ struct subprocess_capability {
 
 /* Function to test two subprocess hashmap entries for equality. */
 extern int cmd2process_cmp(const void *unused_cmp_data,
-			   const struct subprocess_entry *e1,
-			   const struct subprocess_entry *e2,
+			   const void *e1,
+			   const void *e2,
 			   const void *unused_keydata);
 
 /*
diff --git a/submodule-config.c b/submodule-config.c
index 5fe2d0787..2aa8a1747 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -18,6 +18,7 @@ struct submodule_cache {
 	struct hashmap for_path;
 	struct hashmap for_name;
 	unsigned initialized:1;
+	unsigned gitmodules_read:1;
 };
 
 /*
@@ -35,19 +36,25 @@ enum lookup_type {
 };
 
 static int config_path_cmp(const void *unused_cmp_data,
-			   const struct submodule_entry *a,
-			   const struct submodule_entry *b,
+			   const void *entry,
+			   const void *entry_or_key,
 			   const void *unused_keydata)
 {
+	const struct submodule_entry *a = entry;
+	const struct submodule_entry *b = entry_or_key;
+
 	return strcmp(a->config->path, b->config->path) ||
 	       hashcmp(a->config->gitmodules_sha1, b->config->gitmodules_sha1);
 }
 
 static int config_name_cmp(const void *unused_cmp_data,
-			   const struct submodule_entry *a,
-			   const struct submodule_entry *b,
+			   const void *entry,
+			   const void *entry_or_key,
 			   const void *unused_keydata)
 {
+	const struct submodule_entry *a = entry;
+	const struct submodule_entry *b = entry_or_key;
+
 	return strcmp(a->config->name, b->config->name) ||
 	       hashcmp(a->config->gitmodules_sha1, b->config->gitmodules_sha1);
 }
@@ -59,8 +66,8 @@ static struct submodule_cache *submodule_cache_alloc(void)
 
 static void submodule_cache_init(struct submodule_cache *cache)
 {
-	hashmap_init(&cache->for_path, (hashmap_cmp_fn) config_path_cmp, NULL, 0);
-	hashmap_init(&cache->for_name, (hashmap_cmp_fn) config_name_cmp, NULL, 0);
+	hashmap_init(&cache->for_path, config_path_cmp, NULL, 0);
+	hashmap_init(&cache->for_name, config_name_cmp, NULL, 0);
 	cache->initialized = 1;
 }
 
@@ -93,6 +100,7 @@ static void submodule_cache_clear(struct submodule_cache *cache)
 	hashmap_free(&cache->for_path, 1);
 	hashmap_free(&cache->for_name, 1);
 	cache->initialized = 0;
+	cache->gitmodules_read = 0;
 }
 
 void submodule_cache_free(struct submodule_cache *cache)
@@ -232,7 +240,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
 static int parse_fetch_recurse(const char *opt, const char *arg,
 			       int die_on_error)
 {
-	switch (git_config_maybe_bool(opt, arg)) {
+	switch (git_parse_maybe_bool(arg)) {
 	case 1:
 		return RECURSE_SUBMODULES_ON;
 	case 0:
@@ -248,6 +256,14 @@ static int parse_fetch_recurse(const char *opt, const char *arg,
 	}
 }
 
+int parse_submodule_fetchjobs(const char *var, const char *value)
+{
+	int fetchjobs = git_config_int(var, value);
+	if (fetchjobs < 0)
+		die(_("negative values not allowed for submodule.fetchjobs"));
+	return fetchjobs;
+}
+
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
 {
 	return parse_fetch_recurse(opt, arg, 1);
@@ -277,7 +293,7 @@ int option_fetch_parse_recurse_submodules(const struct option *opt,
 static int parse_update_recurse(const char *opt, const char *arg,
 				int die_on_error)
 {
-	switch (git_config_maybe_bool(opt, arg)) {
+	switch (git_parse_maybe_bool(arg)) {
 	case 1:
 		return RECURSE_SUBMODULES_ON;
 	case 0:
@@ -297,7 +313,7 @@ int parse_update_recurse_submodules_arg(const char *opt, const char *arg)
 static int parse_push_recurse(const char *opt, const char *arg,
 			       int die_on_error)
 {
-	switch (git_config_maybe_bool(opt, arg)) {
+	switch (git_parse_maybe_bool(arg)) {
 	case 1:
 		/* There's no simple "on" value when pushing */
 		if (die_on_error)
@@ -441,19 +457,19 @@ static int parse_config(const char *var, const char *value, void *data)
 	return ret;
 }
 
-int gitmodule_sha1_from_commit(const unsigned char *treeish_name,
-				      unsigned char *gitmodules_sha1,
-				      struct strbuf *rev)
+static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
+				     struct object_id *gitmodules_oid,
+				     struct strbuf *rev)
 {
 	int ret = 0;
 
-	if (is_null_sha1(treeish_name)) {
-		hashclr(gitmodules_sha1);
+	if (is_null_oid(treeish_name)) {
+		oidclr(gitmodules_oid);
 		return 1;
 	}
 
-	strbuf_addf(rev, "%s:.gitmodules", sha1_to_hex(treeish_name));
-	if (get_sha1(rev->buf, gitmodules_sha1) >= 0)
+	strbuf_addf(rev, "%s:.gitmodules", oid_to_hex(treeish_name));
+	if (get_oid(rev->buf, gitmodules_oid) >= 0)
 		ret = 1;
 
 	return ret;
@@ -464,13 +480,13 @@ int gitmodule_sha1_from_commit(const unsigned char *treeish_name,
  * revisions.
  */
 static const struct submodule *config_from(struct submodule_cache *cache,
-		const unsigned char *treeish_name, const char *key,
+		const struct object_id *treeish_name, const char *key,
 		enum lookup_type lookup_type)
 {
 	struct strbuf rev = STRBUF_INIT;
 	unsigned long config_size;
 	char *config = NULL;
-	unsigned char sha1[20];
+	struct object_id oid;
 	enum object_type type;
 	const struct submodule *submodule = NULL;
 	struct parse_config_parameter parameter;
@@ -490,28 +506,28 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 		return entry->config;
 	}
 
-	if (!gitmodule_sha1_from_commit(treeish_name, sha1, &rev))
+	if (!gitmodule_oid_from_commit(treeish_name, &oid, &rev))
 		goto out;
 
 	switch (lookup_type) {
 	case lookup_name:
-		submodule = cache_lookup_name(cache, sha1, key);
+		submodule = cache_lookup_name(cache, oid.hash, key);
 		break;
 	case lookup_path:
-		submodule = cache_lookup_path(cache, sha1, key);
+		submodule = cache_lookup_path(cache, oid.hash, key);
 		break;
 	}
 	if (submodule)
 		goto out;
 
-	config = read_sha1_file(sha1, &type, &config_size);
+	config = read_sha1_file(oid.hash, &type, &config_size);
 	if (!config || type != OBJ_BLOB)
 		goto out;
 
 	/* fill the submodule config into the cache */
 	parameter.cache = cache;
-	parameter.treeish_name = treeish_name;
-	parameter.gitmodules_sha1 = sha1;
+	parameter.treeish_name = treeish_name->hash;
+	parameter.gitmodules_sha1 = oid.hash;
 	parameter.overwrite = 0;
 	git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
 			config, config_size, &parameter);
@@ -520,9 +536,9 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 
 	switch (lookup_type) {
 	case lookup_name:
-		return cache_lookup_name(cache, sha1, key);
+		return cache_lookup_name(cache, oid.hash, key);
 	case lookup_path:
-		return cache_lookup_path(cache, sha1, key);
+		return cache_lookup_path(cache, oid.hash, key);
 	default:
 		return NULL;
 	}
@@ -544,13 +560,11 @@ static void submodule_cache_check_init(struct repository *repo)
 	submodule_cache_init(repo->submodule_cache);
 }
 
-int submodule_config_option(struct repository *repo,
-			    const char *var, const char *value)
+static int gitmodules_cb(const char *var, const char *value, void *data)
 {
+	struct repository *repo = data;
 	struct parse_config_parameter parameter;
 
-	submodule_cache_check_init(repo);
-
 	parameter.cache = repo->submodule_cache;
 	parameter.treeish_name = NULL;
 	parameter.gitmodules_sha1 = null_sha1;
@@ -559,30 +573,71 @@ int submodule_config_option(struct repository *repo,
 	return parse_config(var, value, &parameter);
 }
 
-int parse_submodule_config_option(const char *var, const char *value)
+void repo_read_gitmodules(struct repository *repo)
 {
-	return submodule_config_option(the_repository, var, value);
+	submodule_cache_check_init(repo);
+
+	if (repo->worktree) {
+		char *gitmodules;
+
+		if (repo_read_index(repo) < 0)
+			return;
+
+		gitmodules = repo_worktree_path(repo, GITMODULES_FILE);
+
+		if (!is_gitmodules_unmerged(repo->index))
+			git_config_from_file(gitmodules_cb, gitmodules, repo);
+
+		free(gitmodules);
+	}
+
+	repo->submodule_cache->gitmodules_read = 1;
 }
 
-const struct submodule *submodule_from_name(const unsigned char *treeish_name,
-		const char *name)
+void gitmodules_config_oid(const struct object_id *commit_oid)
 {
+	struct strbuf rev = STRBUF_INIT;
+	struct object_id oid;
+
 	submodule_cache_check_init(the_repository);
+
+	if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
+		git_config_from_blob_oid(gitmodules_cb, rev.buf,
+					 &oid, the_repository);
+	}
+	strbuf_release(&rev);
+
+	the_repository->submodule_cache->gitmodules_read = 1;
+}
+
+static void gitmodules_read_check(struct repository *repo)
+{
+	submodule_cache_check_init(repo);
+
+	/* read the repo's .gitmodules file if it hasn't been already */
+	if (!repo->submodule_cache->gitmodules_read)
+		repo_read_gitmodules(repo);
+}
+
+const struct submodule *submodule_from_name(const struct object_id *treeish_name,
+		const char *name)
+{
+	gitmodules_read_check(the_repository);
 	return config_from(the_repository->submodule_cache, treeish_name, name, lookup_name);
 }
 
-const struct submodule *submodule_from_path(const unsigned char *treeish_name,
+const struct submodule *submodule_from_path(const struct object_id *treeish_name,
 		const char *path)
 {
-	submodule_cache_check_init(the_repository);
+	gitmodules_read_check(the_repository);
 	return config_from(the_repository->submodule_cache, treeish_name, path, lookup_path);
 }
 
 const struct submodule *submodule_from_cache(struct repository *repo,
-					     const unsigned char *treeish_name,
+					     const struct object_id *treeish_name,
 					     const char *key)
 {
-	submodule_cache_check_init(repo);
+	gitmodules_read_check(repo);
 	return config_from(repo->submodule_cache, treeish_name,
 			   key, lookup_path);
 }
diff --git a/submodule-config.h b/submodule-config.h
index 233bfcb7f..e3845831f 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -27,25 +27,22 @@ struct repository;
 
 extern void submodule_cache_free(struct submodule_cache *cache);
 
+extern int parse_submodule_fetchjobs(const char *var, const char *value);
 extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
 struct option;
 extern int option_fetch_parse_recurse_submodules(const struct option *opt,
 						 const char *arg, int unset);
 extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
 extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-extern int parse_submodule_config_option(const char *var, const char *value);
-extern int submodule_config_option(struct repository *repo,
-				   const char *var, const char *value);
+extern void repo_read_gitmodules(struct repository *repo);
+extern void gitmodules_config_oid(const struct object_id *commit_oid);
 extern const struct submodule *submodule_from_name(
-		const unsigned char *commit_or_tree, const char *name);
+		const struct object_id *commit_or_tree, const char *name);
 extern const struct submodule *submodule_from_path(
-		const unsigned char *commit_or_tree, const char *path);
+		const struct object_id *commit_or_tree, const char *path);
 extern const struct submodule *submodule_from_cache(struct repository *repo,
-						    const unsigned char *treeish_name,
+						    const struct object_id *treeish_name,
 						    const char *key);
-extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
-				      unsigned char *gitmodules_sha1,
-				      struct strbuf *rev);
 extern void submodule_free(void);
 
 #endif /* SUBMODULE_CONFIG_H */
diff --git a/submodule.c b/submodule.c
index 36f45f5a5..63e7094e1 100644
--- a/submodule.c
+++ b/submodule.c
@@ -20,37 +20,60 @@
 #include "worktree.h"
 #include "parse-options.h"
 
-static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
 static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
-static int parallel_jobs = 1;
 static struct string_list changed_submodule_paths = STRING_LIST_INIT_DUP;
 static int initialized_fetch_ref_tips;
 static struct oid_array ref_tips_before_fetch;
 static struct oid_array ref_tips_after_fetch;
 
 /*
- * The following flag is set if the .gitmodules file is unmerged. We then
- * disable recursion for all submodules where .git/config doesn't have a
- * matching config entry because we can't guess what might be configured in
- * .gitmodules unless the user resolves the conflict. When a command line
- * option is given (which always overrides configuration) this flag will be
- * ignored.
+ * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
+ * will be disabled because we can't guess what might be configured in
+ * .gitmodules unless the user resolves the conflict.
  */
-static int gitmodules_is_unmerged;
+int is_gitmodules_unmerged(const struct index_state *istate)
+{
+	int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
+	if (pos < 0) { /* .gitmodules not found or isn't merged */
+		pos = -1 - pos;
+		if (istate->cache_nr > pos) {  /* there is a .gitmodules */
+			const struct cache_entry *ce = istate->cache[pos];
+			if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
+			    !strcmp(ce->name, GITMODULES_FILE))
+				return 1;
+		}
+	}
+
+	return 0;
+}
 
 /*
- * This flag is set if the .gitmodules file had unstaged modifications on
- * startup. This must be checked before allowing modifications to the
- * .gitmodules file with the intention to stage them later, because when
- * continuing we would stage the modifications the user didn't stage herself
- * too. That might change in a future version when we learn to stage the
- * changes we do ourselves without staging any previous modifications.
+ * Check if the .gitmodules file has unstaged modifications.  This must be
+ * checked before allowing modifications to the .gitmodules file with the
+ * intention to stage them later, because when continuing we would stage the
+ * modifications the user didn't stage herself too. That might change in a
+ * future version when we learn to stage the changes we do ourselves without
+ * staging any previous modifications.
  */
-static int gitmodules_is_modified;
+int is_staging_gitmodules_ok(const struct index_state *istate)
+{
+	int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
 
-int is_staging_gitmodules_ok(void)
+	if ((pos >= 0) && (pos < istate->cache_nr)) {
+		struct stat st;
+		if (lstat(GITMODULES_FILE, &st) == 0 &&
+		    ce_match_stat(istate->cache[pos], &st, 0) & DATA_CHANGED)
+			return 0;
+	}
+
+	return 1;
+}
+
+static int for_each_remote_ref_submodule(const char *submodule,
+					 each_ref_fn fn, void *cb_data)
 {
-	return !gitmodules_is_modified;
+	return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
+					fn, cb_data);
 }
 
 /*
@@ -63,13 +86,13 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
 	struct strbuf entry = STRBUF_INIT;
 	const struct submodule *submodule;
 
-	if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
+	if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
 		return -1;
 
-	if (gitmodules_is_unmerged)
+	if (is_gitmodules_unmerged(&the_index))
 		die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-	submodule = submodule_from_path(null_sha1, oldpath);
+	submodule = submodule_from_path(&null_oid, oldpath);
 	if (!submodule || !submodule->name) {
 		warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
 		return -1;
@@ -77,7 +100,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
 	strbuf_addstr(&entry, "submodule.");
 	strbuf_addstr(&entry, submodule->name);
 	strbuf_addstr(&entry, ".path");
-	if (git_config_set_in_file_gently(".gitmodules", entry.buf, newpath) < 0) {
+	if (git_config_set_in_file_gently(GITMODULES_FILE, entry.buf, newpath) < 0) {
 		/* Maybe the user already did that, don't error out here */
 		warning(_("Could not update .gitmodules entry %s"), entry.buf);
 		strbuf_release(&entry);
@@ -97,20 +120,20 @@ int remove_path_from_gitmodules(const char *path)
 	struct strbuf sect = STRBUF_INIT;
 	const struct submodule *submodule;
 
-	if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
+	if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
 		return -1;
 
-	if (gitmodules_is_unmerged)
+	if (is_gitmodules_unmerged(&the_index))
 		die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-	submodule = submodule_from_path(null_sha1, path);
+	submodule = submodule_from_path(&null_oid, path);
 	if (!submodule || !submodule->name) {
 		warning(_("Could not find section in .gitmodules where path=%s"), path);
 		return -1;
 	}
 	strbuf_addstr(&sect, "submodule.");
 	strbuf_addstr(&sect, submodule->name);
-	if (git_config_rename_section_in_file(".gitmodules", sect.buf, NULL) < 0) {
+	if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
 		/* Maybe the user already did that, don't error out here */
 		warning(_("Could not remove .gitmodules entry for %s"), path);
 		strbuf_release(&sect);
@@ -122,7 +145,7 @@ int remove_path_from_gitmodules(const char *path)
 
 void stage_updated_gitmodules(void)
 {
-	if (add_file_to_cache(".gitmodules", 0))
+	if (add_file_to_cache(GITMODULES_FILE, 0))
 		die(_("staging updated .gitmodules failed"));
 }
 
@@ -147,42 +170,20 @@ done:
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 					     const char *path)
 {
-	const struct submodule *submodule = submodule_from_path(null_sha1, path);
+	const struct submodule *submodule = submodule_from_path(&null_oid, path);
 	if (submodule) {
-		if (submodule->ignore)
-			handle_ignore_submodules_arg(diffopt, submodule->ignore);
-		else if (gitmodules_is_unmerged)
-			DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
-	}
-}
+		const char *ignore;
+		char *key;
 
-/* For loading from the .gitmodules file. */
-static int git_modules_config(const char *var, const char *value, void *cb)
-{
-	if (!strcmp(var, "submodule.fetchjobs")) {
-		parallel_jobs = git_config_int(var, value);
-		if (parallel_jobs < 0)
-			die(_("negative values not allowed for submodule.fetchJobs"));
-		return 0;
-	} else if (starts_with(var, "submodule."))
-		return parse_submodule_config_option(var, value);
-	else if (!strcmp(var, "fetch.recursesubmodules")) {
-		config_fetch_recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
-		return 0;
-	}
-	return 0;
-}
+		key = xstrfmt("submodule.%s.ignore", submodule->name);
+		if (repo_config_get_string_const(the_repository, key, &ignore))
+			ignore = submodule->ignore;
+		free(key);
 
-/* Loads all submodule settings from the config. */
-int submodule_config(const char *var, const char *value, void *cb)
-{
-	if (!strcmp(var, "submodule.recurse")) {
-		int v = git_config_bool(var, value) ?
-			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
-		config_update_recurse_submodules = v;
-		return 0;
-	} else {
-		return git_modules_config(var, value, cb);
+		if (ignore)
+			handle_ignore_submodules_arg(diffopt, ignore);
+		else if (is_gitmodules_unmerged(&the_index))
+			DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
 	}
 }
 
@@ -214,74 +215,6 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 	return 0;
 }
 
-void load_submodule_cache(void)
-{
-	if (config_update_recurse_submodules == RECURSE_SUBMODULES_OFF)
-		return;
-
-	gitmodules_config();
-	git_config(submodule_config, NULL);
-}
-
-void gitmodules_config(void)
-{
-	const char *work_tree = get_git_work_tree();
-	if (work_tree) {
-		struct strbuf gitmodules_path = STRBUF_INIT;
-		int pos;
-		strbuf_addstr(&gitmodules_path, work_tree);
-		strbuf_addstr(&gitmodules_path, "/.gitmodules");
-		if (read_cache() < 0)
-			die("index file corrupt");
-		pos = cache_name_pos(".gitmodules", 11);
-		if (pos < 0) { /* .gitmodules not found or isn't merged */
-			pos = -1 - pos;
-			if (active_nr > pos) {  /* there is a .gitmodules */
-				const struct cache_entry *ce = active_cache[pos];
-				if (ce_namelen(ce) == 11 &&
-				    !memcmp(ce->name, ".gitmodules", 11))
-					gitmodules_is_unmerged = 1;
-			}
-		} else if (pos < active_nr) {
-			struct stat st;
-			if (lstat(".gitmodules", &st) == 0 &&
-			    ce_match_stat(active_cache[pos], &st, 0) & DATA_CHANGED)
-				gitmodules_is_modified = 1;
-		}
-
-		if (!gitmodules_is_unmerged)
-			git_config_from_file(git_modules_config,
-				gitmodules_path.buf, NULL);
-		strbuf_release(&gitmodules_path);
-	}
-}
-
-static int gitmodules_cb(const char *var, const char *value, void *data)
-{
-	struct repository *repo = data;
-	return submodule_config_option(repo, var, value);
-}
-
-void repo_read_gitmodules(struct repository *repo)
-{
-	char *gitmodules_path = repo_worktree_path(repo, ".gitmodules");
-
-	git_config_from_file(gitmodules_cb, gitmodules_path, repo);
-	free(gitmodules_path);
-}
-
-void gitmodules_config_sha1(const unsigned char *commit_sha1)
-{
-	struct strbuf rev = STRBUF_INIT;
-	unsigned char sha1[20];
-
-	if (gitmodule_sha1_from_commit(commit_sha1, sha1, &rev)) {
-		git_config_from_blob_sha1(git_modules_config, rev.buf,
-					  sha1, NULL);
-	}
-	strbuf_release(&rev);
-}
-
 /*
  * Determine if a submodule has been initialized at a given 'path'
  */
@@ -293,7 +226,7 @@ int is_submodule_active(struct repository *repo, const char *path)
 	const struct string_list *sl;
 	const struct submodule *module;
 
-	module = submodule_from_cache(repo, null_sha1, path);
+	module = submodule_from_cache(repo, &null_oid, path);
 
 	/* early return if there isn't a path->module mapping */
 	if (!module)
@@ -410,24 +343,38 @@ void die_path_inside_submodule(const struct index_state *istate,
 	}
 }
 
-int parse_submodule_update_strategy(const char *value,
-		struct submodule_update_strategy *dst)
+enum submodule_update_type parse_submodule_update_type(const char *value)
 {
-	free((void*)dst->command);
-	dst->command = NULL;
 	if (!strcmp(value, "none"))
-		dst->type = SM_UPDATE_NONE;
+		return SM_UPDATE_NONE;
 	else if (!strcmp(value, "checkout"))
-		dst->type = SM_UPDATE_CHECKOUT;
+		return SM_UPDATE_CHECKOUT;
 	else if (!strcmp(value, "rebase"))
-		dst->type = SM_UPDATE_REBASE;
+		return SM_UPDATE_REBASE;
 	else if (!strcmp(value, "merge"))
-		dst->type = SM_UPDATE_MERGE;
-	else if (skip_prefix(value, "!", &value)) {
-		dst->type = SM_UPDATE_COMMAND;
-		dst->command = xstrdup(value);
-	} else
+		return SM_UPDATE_MERGE;
+	else if (*value == '!')
+		return SM_UPDATE_COMMAND;
+	else
+		return SM_UPDATE_UNSPECIFIED;
+}
+
+int parse_submodule_update_strategy(const char *value,
+		struct submodule_update_strategy *dst)
+{
+	enum submodule_update_type type;
+
+	free((void*)dst->command);
+	dst->command = NULL;
+
+	type = parse_submodule_update_type(value);
+	if (type == SM_UPDATE_UNSPECIFIED)
 		return -1;
+
+	dst->type = type;
+	if (type == SM_UPDATE_COMMAND)
+		dst->command = xstrdup(value + 1);
+
 	return 0;
 }
 
@@ -490,9 +437,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
 	return prepare_revision_walk(rev);
 }
 
-static void print_submodule_summary(struct rev_info *rev, FILE *f,
-		const char *line_prefix,
-		const char *del, const char *add, const char *reset)
+static void print_submodule_summary(struct rev_info *rev, struct diff_options *o)
 {
 	static const char format[] = "  %m %s";
 	struct strbuf sb = STRBUF_INIT;
@@ -503,18 +448,12 @@ static void print_submodule_summary(struct rev_info *rev, FILE *f,
 		ctx.date_mode = rev->date_mode;
 		ctx.output_encoding = get_log_output_encoding();
 		strbuf_setlen(&sb, 0);
-		strbuf_addstr(&sb, line_prefix);
-		if (commit->object.flags & SYMMETRIC_LEFT) {
-			if (del)
-				strbuf_addstr(&sb, del);
-		}
-		else if (add)
-			strbuf_addstr(&sb, add);
 		format_commit_message(commit, format, &sb, &ctx);
-		if (reset)
-			strbuf_addstr(&sb, reset);
 		strbuf_addch(&sb, '\n');
-		fprintf(f, "%s", sb.buf);
+		if (commit->object.flags & SYMMETRIC_LEFT)
+			diff_emit_submodule_del(o, sb.buf);
+		else
+			diff_emit_submodule_add(o, sb.buf);
 	}
 	strbuf_release(&sb);
 }
@@ -541,11 +480,9 @@ void prepare_submodule_repo_env(struct argv_array *out)
  * attempt to lookup both the left and right commits and put them into the
  * left and right pointers.
  */
-static void show_submodule_header(FILE *f, const char *path,
-		const char *line_prefix,
+static void show_submodule_header(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
-		unsigned dirty_submodule, const char *meta,
-		const char *reset,
+		unsigned dirty_submodule,
 		struct commit **left, struct commit **right,
 		struct commit_list **merge_bases)
 {
@@ -554,11 +491,10 @@ static void show_submodule_header(FILE *f, const char *path,
 	int fast_forward = 0, fast_backward = 0;
 
 	if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
-		fprintf(f, "%sSubmodule %s contains untracked content\n",
-			line_prefix, path);
+		diff_emit_submodule_untracked(o, path);
+
 	if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
-		fprintf(f, "%sSubmodule %s contains modified content\n",
-			line_prefix, path);
+		diff_emit_submodule_modified(o, path);
 
 	if (is_null_oid(one))
 		message = "(new submodule)";
@@ -567,7 +503,7 @@ static void show_submodule_header(FILE *f, const char *path,
 
 	if (add_submodule_odb(path)) {
 		if (!message)
-			message = "(not initialized)";
+			message = "(commits not present)";
 		goto output_header;
 	}
 
@@ -600,31 +536,29 @@ static void show_submodule_header(FILE *f, const char *path,
 	}
 
 output_header:
-	strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
+	strbuf_addf(&sb, "Submodule %s ", path);
 	strbuf_add_unique_abbrev(&sb, one->hash, DEFAULT_ABBREV);
 	strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
 	strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV);
 	if (message)
-		strbuf_addf(&sb, " %s%s\n", message, reset);
+		strbuf_addf(&sb, " %s\n", message);
 	else
-		strbuf_addf(&sb, "%s:%s\n", fast_backward ? " (rewind)" : "", reset);
-	fwrite(sb.buf, sb.len, 1, f);
+		strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
+	diff_emit_submodule_header(o, sb.buf);
 
 	strbuf_release(&sb);
 }
 
-void show_submodule_summary(FILE *f, const char *path,
-		const char *line_prefix,
+void show_submodule_summary(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
-		unsigned dirty_submodule, const char *meta,
-		const char *del, const char *add, const char *reset)
+		unsigned dirty_submodule)
 {
 	struct rev_info rev;
 	struct commit *left = NULL, *right = NULL;
 	struct commit_list *merge_bases = NULL;
 
-	show_submodule_header(f, path, line_prefix, one, two, dirty_submodule,
-			      meta, reset, &left, &right, &merge_bases);
+	show_submodule_header(o, path, one, two, dirty_submodule,
+			      &left, &right, &merge_bases);
 
 	/*
 	 * If we don't have both a left and a right pointer, there is no
@@ -636,11 +570,11 @@ void show_submodule_summary(FILE *f, const char *path,
 
 	/* Treat revision walker failure the same as missing commits */
 	if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
-		fprintf(f, "%s(revision walker failed)\n", line_prefix);
+		diff_emit_submodule_error(o, "(revision walker failed)\n");
 		goto out;
 	}
 
-	print_submodule_summary(&rev, f, line_prefix, del, add, reset);
+	print_submodule_summary(&rev, o);
 
 out:
 	if (merge_bases)
@@ -649,21 +583,18 @@ out:
 	clear_commit_marks(right, ~0);
 }
 
-void show_submodule_inline_diff(FILE *f, const char *path,
-		const char *line_prefix,
+void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
-		unsigned dirty_submodule, const char *meta,
-		const char *del, const char *add, const char *reset,
-		const struct diff_options *o)
+		unsigned dirty_submodule)
 {
 	const struct object_id *old = &empty_tree_oid, *new = &empty_tree_oid;
 	struct commit *left = NULL, *right = NULL;
 	struct commit_list *merge_bases = NULL;
-	struct strbuf submodule_dir = STRBUF_INIT;
 	struct child_process cp = CHILD_PROCESS_INIT;
+	struct strbuf sb = STRBUF_INIT;
 
-	show_submodule_header(f, path, line_prefix, one, two, dirty_submodule,
-			      meta, reset, &left, &right, &merge_bases);
+	show_submodule_header(o, path, one, two, dirty_submodule,
+			      &left, &right, &merge_bases);
 
 	/* We need a valid left and right commit to display a difference */
 	if (!(left || is_null_oid(one)) ||
@@ -675,16 +606,16 @@ void show_submodule_inline_diff(FILE *f, const char *path,
 	if (right)
 		new = two;
 
-	fflush(f);
 	cp.git_cmd = 1;
 	cp.dir = path;
-	cp.out = dup(fileno(f));
+	cp.out = -1;
 	cp.no_stdin = 1;
 
 	/* TODO: other options may need to be passed here. */
 	argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL);
+	argv_array_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
+			 "always" : "never");
 
-	argv_array_pushf(&cp.args, "--line-prefix=%s", line_prefix);
 	if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
 		argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
 				 o->b_prefix, path);
@@ -707,11 +638,17 @@ void show_submodule_inline_diff(FILE *f, const char *path,
 		argv_array_push(&cp.args, oid_to_hex(new));
 
 	prepare_submodule_repo_env(&cp.env_array);
-	if (run_command(&cp))
-		fprintf(f, "(diff failed)\n");
+	if (start_command(&cp))
+		diff_emit_submodule_error(o, "(diff failed)\n");
+
+	while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
+		diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
+
+	if (finish_command(&cp))
+		diff_emit_submodule_error(o, "(diff failed)\n");
 
 done:
-	strbuf_release(&submodule_dir);
+	strbuf_release(&sb);
 	if (merge_bases)
 		free_commit_list(merge_bases);
 	if (left)
@@ -720,11 +657,6 @@ done:
 		clear_commit_marks(right, ~0);
 }
 
-void set_config_fetch_recurse_submodules(int value)
-{
-	config_fetch_recurse_submodules = value;
-}
-
 int should_update_submodules(void)
 {
 	return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
@@ -738,7 +670,7 @@ const struct submodule *submodule_from_ce(const struct cache_entry *ce)
 	if (!should_update_submodules())
 		return NULL;
 
-	return submodule_from_path(null_sha1, ce->name);
+	return submodule_from_path(&null_oid, ce->name);
 }
 
 static struct oid_array *submodule_commits(struct string_list *submodules,
@@ -842,19 +774,36 @@ static int append_oid_to_argv(const struct object_id *oid, void *data)
 	return 0;
 }
 
+struct has_commit_data {
+	int result;
+	const char *path;
+};
+
 static int check_has_commit(const struct object_id *oid, void *data)
 {
-	int *has_commit = data;
+	struct has_commit_data *cb = data;
 
-	if (!lookup_commit_reference(oid))
-		*has_commit = 0;
+	enum object_type type = sha1_object_info(oid->hash, NULL);
 
-	return 0;
+	switch (type) {
+	case OBJ_COMMIT:
+		return 0;
+	case OBJ_BAD:
+		/*
+		 * Object is missing or invalid. If invalid, an error message
+		 * has already been printed.
+		 */
+		cb->result = 0;
+		return 0;
+	default:
+		die(_("submodule entry '%s' (%s) is a %s, not a commit"),
+		    cb->path, oid_to_hex(oid), typename(type));
+	}
 }
 
 static int submodule_has_commits(const char *path, struct oid_array *commits)
 {
-	int has_commit = 1;
+	struct has_commit_data has_commit = { 1, path };
 
 	/*
 	 * Perform a cheap, but incorrect check for the existence of 'commits'.
@@ -870,7 +819,7 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
 
 	oid_array_for_each_unique(commits, check_has_commit, &has_commit);
 
-	if (has_commit) {
+	if (has_commit.result) {
 		/*
 		 * Even if the submodule is checked out and the commit is
 		 * present, make sure it exists in the submodule's object store
@@ -889,12 +838,12 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
 		cp.dir = path;
 
 		if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
-			has_commit = 0;
+			has_commit.result = 0;
 
 		strbuf_release(&out);
 	}
 
-	return has_commit;
+	return has_commit.result;
 }
 
 static int submodule_needs_pushing(const char *path, struct oid_array *commits)
@@ -1157,7 +1106,6 @@ int submodule_touches_in_range(struct object_id *excl_oid,
 	struct argv_array args = ARGV_ARRAY_INIT;
 	int ret;
 
-	gitmodules_config();
 	/* No need to check if there are no submodules configured */
 	if (!submodule_from_path(NULL, NULL))
 		return 0;
@@ -1182,10 +1130,11 @@ struct submodule_parallel_fetch {
 	const char *work_tree;
 	const char *prefix;
 	int command_line_option;
+	int default_option;
 	int quiet;
 	int result;
 };
-#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0}
+#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
 
 static int get_next_submodule(struct child_process *cp,
 			      struct strbuf *err, void *data, void **task_cb)
@@ -1204,29 +1153,36 @@ static int get_next_submodule(struct child_process *cp,
 		if (!S_ISGITLINK(ce->ce_mode))
 			continue;
 
-		submodule = submodule_from_path(null_sha1, ce->name);
-		if (!submodule)
-			submodule = submodule_from_name(null_sha1, ce->name);
+		submodule = submodule_from_path(&null_oid, ce->name);
 
 		default_argv = "yes";
 		if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) {
-			if (submodule &&
-			    submodule->fetch_recurse !=
-						RECURSE_SUBMODULES_NONE) {
-				if (submodule->fetch_recurse ==
-						RECURSE_SUBMODULES_OFF)
+			int fetch_recurse = RECURSE_SUBMODULES_NONE;
+
+			if (submodule) {
+				char *key;
+				const char *value;
+
+				fetch_recurse = submodule->fetch_recurse;
+				key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
+				if (!repo_config_get_string_const(the_repository, key, &value)) {
+					fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
+				}
+				free(key);
+			}
+
+			if (fetch_recurse != RECURSE_SUBMODULES_NONE) {
+				if (fetch_recurse == RECURSE_SUBMODULES_OFF)
 					continue;
-				if (submodule->fetch_recurse ==
-						RECURSE_SUBMODULES_ON_DEMAND) {
+				if (fetch_recurse == RECURSE_SUBMODULES_ON_DEMAND) {
 					if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
 						continue;
 					default_argv = "on-demand";
 				}
 			} else {
-				if ((config_fetch_recurse_submodules == RECURSE_SUBMODULES_OFF) ||
-				    gitmodules_is_unmerged)
+				if (spf->default_option == RECURSE_SUBMODULES_OFF)
 					continue;
-				if (config_fetch_recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) {
+				if (spf->default_option == RECURSE_SUBMODULES_ON_DEMAND) {
 					if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
 						continue;
 					default_argv = "on-demand";
@@ -1293,6 +1249,7 @@ static int fetch_finish(int retvalue, struct strbuf *err,
 
 int fetch_populated_submodules(const struct argv_array *options,
 			       const char *prefix, int command_line_option,
+			       int default_option,
 			       int quiet, int max_parallel_jobs)
 {
 	int i;
@@ -1300,6 +1257,7 @@ int fetch_populated_submodules(const struct argv_array *options,
 
 	spf.work_tree = get_git_work_tree();
 	spf.command_line_option = command_line_option;
+	spf.default_option = default_option;
 	spf.quiet = quiet;
 	spf.prefix = prefix;
 
@@ -1315,9 +1273,6 @@ int fetch_populated_submodules(const struct argv_array *options,
 	argv_array_push(&spf.args, "--recurse-submodules-default");
 	/* default value, "--submodule-prefix" and its value are added later */
 
-	if (max_parallel_jobs < 0)
-		max_parallel_jobs = parallel_jobs;
-
 	calculate_changed_submodule_paths();
 	run_processes_parallel(max_parallel_jobs,
 			       get_next_submodule,
@@ -1582,7 +1537,7 @@ int submodule_move_head(const char *path,
 	if (old && !is_submodule_populated_gently(path, error_code_ptr))
 		return 0;
 
-	sub = submodule_from_path(null_sha1, path);
+	sub = submodule_from_path(&null_oid, path);
 
 	if (!sub)
 		die("BUG: could not get submodule information for '%s'", path);
@@ -1696,6 +1651,8 @@ static int find_first_merges(struct object_array *result, const char *path,
 			oid_to_hex(&a->object.oid));
 	init_revisions(&revs, NULL);
 	rev_opts.submodule = path;
+	/* FIXME: can't handle linked worktrees in submodules yet */
+	revs.single_worktree = path != NULL;
 	setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
 
 	/* save all revisions from the above list that contain b */
@@ -1728,7 +1685,7 @@ static int find_first_merges(struct object_array *result, const char *path,
 			add_object_array(merges.objects[i].item, NULL, result);
 	}
 
-	free(merges.objects);
+	object_array_clear(&merges);
 	return result->nr;
 }
 
@@ -1833,15 +1790,10 @@ int merge_submodule(struct object_id *result, const char *path,
 			print_commit((struct commit *) merges.objects[i].item);
 	}
 
-	free(merges.objects);
+	object_array_clear(&merges);
 	return 0;
 }
 
-int parallel_submodules(void)
-{
-	return parallel_jobs;
-}
-
 /*
  * Embeds a single submodules git directory into the superprojects git dir,
  * non recursively.
@@ -1864,7 +1816,7 @@ static void relocate_single_git_dir_into_superproject(const char *prefix,
 
 	real_old_git_dir = real_pathdup(old_git_dir, 1);
 
-	sub = submodule_from_path(null_sha1, path);
+	sub = submodule_from_path(&null_oid, path);
 	if (!sub)
 		die(_("could not lookup name for submodule '%s'"), path);
 
@@ -1920,7 +1872,7 @@ void absorb_git_dir_into_superproject(const char *prefix,
 		* superproject did not rewrite the git file links yet,
 		* fix it now.
 		*/
-		sub = submodule_from_path(null_sha1, path);
+		sub = submodule_from_path(&null_oid, path);
 		if (!sub)
 			die(_("could not lookup name for submodule '%s'"), path);
 		connect_work_tree_and_git_dir(path,
@@ -2045,6 +1997,10 @@ const char *get_superproject_working_tree(void)
 	return ret;
 }
 
+/*
+ * Put the gitdir for a submodule (given relative to the main
+ * repository worktree) into `buf`, or return -1 on error.
+ */
 int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
 {
 	const struct submodule *sub;
@@ -2062,8 +2018,7 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
 		strbuf_addstr(buf, git_dir);
 	}
 	if (!is_git_directory(buf->buf)) {
-		gitmodules_config();
-		sub = submodule_from_path(null_sha1, submodule);
+		sub = submodule_from_path(&null_oid, submodule);
 		if (!sub) {
 			ret = -1;
 			goto cleanup;
diff --git a/submodule.h b/submodule.h
index 3c239d1ec..f0da0277a 100644
--- a/submodule.h
+++ b/submodule.h
@@ -33,22 +33,18 @@ struct submodule_update_strategy {
 };
 #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
 
-extern int is_staging_gitmodules_ok(void);
+extern int is_gitmodules_unmerged(const struct index_state *istate);
+extern int is_staging_gitmodules_ok(const struct index_state *istate);
 extern int update_path_in_gitmodules(const char *oldpath, const char *newpath);
 extern int remove_path_from_gitmodules(const char *path);
 extern void stage_updated_gitmodules(void);
 extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
 		const char *path);
-extern int submodule_config(const char *var, const char *value, void *cb);
 extern int git_default_submodule_config(const char *var, const char *value, void *cb);
 
 struct option;
 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 						     const char *arg, int unset);
-void load_submodule_cache(void);
-extern void gitmodules_config(void);
-extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
 extern int is_submodule_active(struct repository *repo, const char *path);
 /*
  * Determine if a submodule has been populated at a given 'path' by checking if
@@ -61,22 +57,17 @@ extern void die_in_unpopulated_submodule(const struct index_state *istate,
 					 const char *prefix);
 extern void die_path_inside_submodule(const struct index_state *istate,
 				      const struct pathspec *ps);
+extern enum submodule_update_type parse_submodule_update_type(const char *value);
 extern int parse_submodule_update_strategy(const char *value,
 		struct submodule_update_strategy *dst);
 extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
 extern void handle_ignore_submodules_arg(struct diff_options *, const char *);
-extern void show_submodule_summary(FILE *f, const char *path,
-		const char *line_prefix,
+extern void show_submodule_summary(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
-		unsigned dirty_submodule, const char *meta,
-		const char *del, const char *add, const char *reset);
-extern void show_submodule_inline_diff(FILE *f, const char *path,
-		const char *line_prefix,
+		unsigned dirty_submodule);
+extern void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
-		unsigned dirty_submodule, const char *meta,
-		const char *del, const char *add, const char *reset,
-		const struct diff_options *opt);
-extern void set_config_fetch_recurse_submodules(int value);
+		unsigned dirty_submodule);
 /* Check if we want to update any submodule.*/
 extern int should_update_submodules(void);
 /*
@@ -87,6 +78,7 @@ extern const struct submodule *submodule_from_ce(const struct cache_entry *ce);
 extern void check_for_new_submodule_commits(struct object_id *oid);
 extern int fetch_populated_submodules(const struct argv_array *options,
 			       const char *prefix, int command_line_option,
+			       int default_option,
 			       int quiet, int max_parallel_jobs);
 extern unsigned is_submodule_modified(const char *path, int ignore_untracked);
 extern int submodule_uses_gitfile(const char *path);
@@ -112,7 +104,6 @@ extern int push_unpushed_submodules(struct oid_array *commits,
 				    const struct string_list *push_options,
 				    int dry_run);
 extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
-extern int parallel_submodules(void);
 /*
  * Given a submodule path (as in the index), return the repository
  * path of that submodule in 'buf'. Return -1 on error or when the
diff --git a/t/helper/.gitignore b/t/helper/.gitignore
index 721650256..7c9d28a83 100644
--- a/t/helper/.gitignore
+++ b/t/helper/.gitignore
@@ -35,3 +35,4 @@
 /test-svn-fe
 /test-urlmatch-normalization
 /test-wildmatch
+/test-write-cache
diff --git a/t/helper/test-delta.c b/t/helper/test-delta.c
index 59937dc1b..591730adc 100644
--- a/t/helper/test-delta.c
+++ b/t/helper/test-delta.c
@@ -69,7 +69,7 @@ int cmd_main(int argc, const char **argv)
 	}
 
 	fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
-	if (fd < 0 || write_in_full(fd, out_buf, out_size) != out_size) {
+	if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) {
 		perror(argv[4]);
 		return 1;
 	}
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index 095d7395f..1145d5167 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -13,20 +13,20 @@ static const char *get_value(const struct test_entry *e)
 	return e->key + strlen(e->key) + 1;
 }
 
-static int test_entry_cmp(const void *unused_cmp_data,
-			  const struct test_entry *e1,
-			  const struct test_entry *e2,
-			  const char* key)
+static int test_entry_cmp(const void *cmp_data,
+			  const void *entry,
+			  const void *entry_or_key,
+			  const void *keydata)
 {
-	return strcmp(e1->key, key ? key : e2->key);
-}
-
-static int test_entry_cmp_icase(const void *unused_cmp_data,
-				const struct test_entry *e1,
-				const struct test_entry *e2,
-				const char* key)
-{
-	return strcasecmp(e1->key, key ? key : e2->key);
+	const int ignore_case = cmp_data ? *((int *)cmp_data) : 0;
+	const struct test_entry *e1 = entry;
+	const struct test_entry *e2 = entry_or_key;
+	const char *key = keydata;
+
+	if (ignore_case)
+		return strcasecmp(e1->key, key ? key : e2->key);
+	else
+		return strcmp(e1->key, key ? key : e2->key);
 }
 
 static struct test_entry *alloc_test_entry(int hash, char *key, int klen,
@@ -96,8 +96,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 	if (method & TEST_ADD) {
 		/* test adding to the map */
 		for (j = 0; j < rounds; j++) {
-			hashmap_init(&map, (hashmap_cmp_fn) test_entry_cmp,
-				     NULL, 0);
+			hashmap_init(&map, test_entry_cmp, NULL, 0);
 
 			/* add entries */
 			for (i = 0; i < TEST_SIZE; i++) {
@@ -109,7 +108,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 		}
 	} else {
 		/* test map lookups */
-		hashmap_init(&map, (hashmap_cmp_fn) test_entry_cmp, NULL, 0);
+		hashmap_init(&map, test_entry_cmp, NULL, 0);
 
 		/* fill the map (sparsely if specified) */
 		j = (method & TEST_SPARSE) ? TEST_SIZE / 10 : TEST_SIZE;
@@ -151,8 +150,7 @@ int cmd_main(int argc, const char **argv)
 
 	/* init hash map */
 	icase = argc > 1 && !strcmp("ignorecase", argv[1]);
-	hashmap_init(&map, (hashmap_cmp_fn) (icase ? test_entry_cmp_icase
-			: test_entry_cmp), NULL, 0);
+	hashmap_init(&map, test_entry_cmp, &icase, 0);
 
 	/* process commands from stdin */
 	while (fgets(line, sizeof(line), stdin)) {
@@ -237,7 +235,8 @@ int cmd_main(int argc, const char **argv)
 		} else if (!strcmp("size", cmd)) {
 
 			/* print table sizes */
-			printf("%u %u\n", map.tablesize, map.size);
+			printf("%u %u\n", map.tablesize,
+			       hashmap_get_size(&map));
 
 		} else if (!strcmp("intern", cmd) && l1) {
 
diff --git a/t/helper/test-line-buffer.c b/t/helper/test-line-buffer.c
index 81575fe2a..078dd7e29 100644
--- a/t/helper/test-line-buffer.c
+++ b/t/helper/test-line-buffer.c
@@ -17,27 +17,17 @@ static uint32_t strtouint32(const char *s)
 
 static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
 {
-	switch (*command) {
-	case 'b':
-		if (starts_with(command, "binary ")) {
-			struct strbuf sb = STRBUF_INIT;
-			strbuf_addch(&sb, '>');
-			buffer_read_binary(buf, &sb, strtouint32(arg));
-			fwrite(sb.buf, 1, sb.len, stdout);
-			strbuf_release(&sb);
-			return;
-		}
-	case 'c':
-		if (starts_with(command, "copy ")) {
-			buffer_copy_bytes(buf, strtouint32(arg));
-			return;
-		}
-	case 's':
-		if (starts_with(command, "skip ")) {
-			buffer_skip_bytes(buf, strtouint32(arg));
-			return;
-		}
-	default:
+	if (starts_with(command, "binary ")) {
+		struct strbuf sb = STRBUF_INIT;
+		strbuf_addch(&sb, '>');
+		buffer_read_binary(buf, &sb, strtouint32(arg));
+		fwrite(sb.buf, 1, sb.len, stdout);
+		strbuf_release(&sb);
+	} else if (starts_with(command, "copy ")) {
+		buffer_copy_bytes(buf, strtouint32(arg));
+	} else if (starts_with(command, "skip ")) {
+		buffer_skip_bytes(buf, strtouint32(arg));
+	} else {
 		die("unrecognized command: %s", command);
 	}
 }
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 75fe883aa..630c76d12 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -99,6 +99,8 @@ int cmd_main(int argc, const char **argv)
 	const char *prefix = "prefix/";
 	const char *usage[] = {
 		"test-parse-options <options>",
+		"",
+		"A helper function for the parse-options API.",
 		NULL
 	};
 	struct string_list expect = STRING_LIST_INIT_NODUP;
diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c
index c6c57bba0..f23db3b19 100644
--- a/t/helper/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -10,11 +10,6 @@ static void die_usage(int argc, const char **argv, const char *msg)
 	exit(1);
 }
 
-static int git_test_config(const char *var, const char *value, void *cb)
-{
-	return parse_submodule_config_option(var, value);
-}
-
 int cmd_main(int argc, const char **argv)
 {
 	const char **arg = argv;
@@ -37,11 +32,9 @@ int cmd_main(int argc, const char **argv)
 		die_usage(argc, argv, "Wrong number of arguments.");
 
 	setup_git_directory();
-	gitmodules_config();
-	git_config(git_test_config, NULL);
 
 	while (*arg) {
-		unsigned char commit_sha1[20];
+		struct object_id commit_oid;
 		const struct submodule *submodule;
 		const char *commit;
 		const char *path_or_name;
@@ -50,14 +43,14 @@ int cmd_main(int argc, const char **argv)
 		path_or_name = arg[1];
 
 		if (commit[0] == '\0')
-			hashclr(commit_sha1);
-		else if (get_sha1(commit, commit_sha1) < 0)
+			oidclr(&commit_oid);
+		else if (get_oid(commit, &commit_oid) < 0)
 			die_usage(argc, argv, "Commit not found.");
 
 		if (lookup_name) {
-			submodule = submodule_from_name(commit_sha1, path_or_name);
+			submodule = submodule_from_name(&commit_oid, path_or_name);
 		} else
-			submodule = submodule_from_path(commit_sha1, path_or_name);
+			submodule = submodule_from_path(&commit_oid, path_or_name);
 		if (!submodule)
 			die_usage(argc, argv, "Submodule not found.");
 
diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c
new file mode 100644
index 000000000..b7ee03966
--- /dev/null
+++ b/t/helper/test-write-cache.c
@@ -0,0 +1,23 @@
+#include "cache.h"
+#include "lockfile.h"
+
+static struct lock_file index_lock;
+
+int cmd_main(int argc, const char **argv)
+{
+	int i, cnt = 1, lockfd;
+	if (argc == 2)
+		cnt = strtol(argv[1], NULL, 0);
+	setup_git_directory();
+	read_cache();
+	for (i = 0; i < cnt; i++) {
+		lockfd = hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
+		if (0 <= lockfd) {
+			write_locked_index(&the_index, &index_lock, COMMIT_LOCK);
+		} else {
+			rollback_lock_file(&index_lock);
+		}
+	}
+
+	return 0;
+}
diff --git a/t/perf/p0007-write-cache.sh b/t/perf/p0007-write-cache.sh
new file mode 100755
index 000000000..261fe92fd
--- /dev/null
+++ b/t/perf/p0007-write-cache.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+test_description="Tests performance of writing the index"
+
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success "setup repo" '
+	if git rev-parse --verify refs/heads/p0006-ballast^{commit}
+	then
+		echo Assuming synthetic repo from many-files.sh
+		git config --local core.sparsecheckout 1
+		cat >.git/info/sparse-checkout <<-EOF
+		/*
+		!ballast/*
+		EOF
+	else
+		echo Assuming non-synthetic repo...
+	fi &&
+	nr_files=$(git ls-files | wc -l)
+'
+
+count=3
+test_perf "write_locked_index $count times ($nr_files files)" "
+	test-write-cache $count
+"
+
+test_done
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 74d2cd76f..0c2fc81d7 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -10,6 +10,8 @@ test_description='our own option parser'
 cat >expect <<\EOF
 usage: test-parse-options <options>
 
+    A helper function for the parse-options API.
+
     --yes                 get a boolean
     -D, --no-doubt        begins with 'no-'
     -B, --no-fear         be brave
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c70cf4230..c7ce5d8bb 100755
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -218,7 +218,7 @@ test_expect_success 'D/F' '
 		echo "100644 $a 2	subdir/file2"
 		echo "100644 $b 3	subdir/file2/another"
 	) >expect &&
-	test_cmp actual expect
+	test_cmp expect actual
 
 '
 
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
deleted file mode 100755
index 397ccb690..000000000
--- a/t/t1200-tutorial.sh
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Johannes Schindelin
-#
-
-test_description='A simple turial in the form of a test case'
-
-. ./test-lib.sh
-
-test_expect_success 'blob'  '
-	echo "Hello World" > hello &&
-	echo "Silly example" > example &&
-
-	git update-index --add hello example &&
-
-	test blob = "$(git cat-file -t 557db03)"
-'
-
-test_expect_success 'blob 557db03' '
-	test "Hello World" = "$(git cat-file blob 557db03)"
-'
-
-echo "It's a new day for git" >>hello
-cat > diff.expect << EOF
-diff --git a/hello b/hello
-index 557db03..263414f 100644
---- a/hello
-+++ b/hello
-@@ -1 +1,2 @@
- Hello World
-+It's a new day for git
-EOF
-
-test_expect_success 'git diff-files -p' '
-	git diff-files -p > diff.output &&
-	test_cmp diff.expect diff.output
-'
-
-test_expect_success 'git diff' '
-	git diff > diff.output &&
-	test_cmp diff.expect diff.output
-'
-
-test_expect_success 'tree' '
-	tree=$(git write-tree 2>/dev/null) &&
-	test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
-'
-
-test_expect_success 'git diff-index -p HEAD' '
-	test_tick &&
-	tree=$(git write-tree) &&
-	commit=$(echo "Initial commit" | git commit-tree $tree) &&
-	git update-ref HEAD $commit &&
-	git diff-index -p HEAD > diff.output &&
-	test_cmp diff.expect diff.output
-'
-
-test_expect_success 'git diff HEAD' '
-	git diff HEAD > diff.output &&
-	test_cmp diff.expect diff.output
-'
-
-cat > whatchanged.expect << EOF
-commit VARIABLE
-Author: VARIABLE
-Date:   VARIABLE
-
-    Initial commit
-
-diff --git a/example b/example
-new file mode 100644
-index 0000000..f24c74a
---- /dev/null
-+++ b/example
-@@ -0,0 +1 @@
-+Silly example
-diff --git a/hello b/hello
-new file mode 100644
-index 0000000..557db03
---- /dev/null
-+++ b/hello
-@@ -0,0 +1 @@
-+Hello World
-EOF
-
-test_expect_success 'git whatchanged -p --root' '
-	git whatchanged -p --root |
-		sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
-		-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
-	> whatchanged.output &&
-	test_cmp whatchanged.expect whatchanged.output
-'
-
-test_expect_success 'git tag my-first-tag' '
-	git tag my-first-tag &&
-	test_cmp .git/refs/heads/master .git/refs/tags/my-first-tag
-'
-
-test_expect_success 'git checkout -b mybranch' '
-	git checkout -b mybranch &&
-	test_cmp .git/refs/heads/master .git/refs/heads/mybranch
-'
-
-cat > branch.expect <<EOF
-  master
-* mybranch
-EOF
-
-test_expect_success 'git branch' '
-	git branch > branch.output &&
-	test_cmp branch.expect branch.output
-'
-
-test_expect_success 'git resolve now fails' '
-	git checkout mybranch &&
-	echo "Work, work, work" >>hello &&
-	test_tick &&
-	git commit -m "Some work." -i hello &&
-
-	git checkout master &&
-
-	echo "Play, play, play" >>hello &&
-	echo "Lots of fun" >>example &&
-	test_tick &&
-	git commit -m "Some fun." -i hello example &&
-
-	test_must_fail git merge -m "Merge work in mybranch" mybranch
-'
-
-cat > hello << EOF
-Hello World
-It's a new day for git
-Play, play, play
-Work, work, work
-EOF
-
-cat > show-branch.expect << EOF
-* [master] Merge work in mybranch
- ! [mybranch] Some work.
---
--  [master] Merge work in mybranch
-*+ [mybranch] Some work.
-*  [master^] Some fun.
-EOF
-
-test_expect_success 'git show-branch' '
-	test_tick &&
-	git commit -m "Merge work in mybranch" -i hello &&
-	git show-branch --topo-order --more=1 master mybranch \
-		> show-branch.output &&
-	test_cmp show-branch.expect show-branch.output
-'
-
-cat > resolve.expect << EOF
-Updating VARIABLE..VARIABLE
-FASTFORWARD (no commit created; -m option ignored)
- example | 1 +
- hello   | 1 +
- 2 files changed, 2 insertions(+)
-EOF
-
-test_expect_success 'git resolve' '
-	git checkout mybranch &&
-	git merge -m "Merge upstream changes." master |
-		sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
-		-e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
-'
-
-test_expect_success 'git resolve output' '
-	test_i18ncmp resolve.expect resolve.output
-'
-
-cat > show-branch2.expect << EOF
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-EOF
-
-test_expect_success 'git show-branch (part 2)' '
-	git show-branch --topo-order master mybranch > show-branch2.output &&
-	test_cmp show-branch2.expect show-branch2.output
-'
-
-cat > show-branch3.expect << EOF
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-+* [master^2] Some work.
-+* [master^] Some fun.
-EOF
-
-test_expect_success 'git show-branch (part 3)' '
-	git show-branch --topo-order --more=2 master mybranch \
-		> show-branch3.output &&
-	test_cmp show-branch3.expect show-branch3.output
-'
-
-test_expect_success 'rewind to "Some fun." and "Some work."' '
-	git checkout mybranch &&
-	git reset --hard master^2 &&
-	git checkout master &&
-	git reset --hard master^
-'
-
-cat > show-branch4.expect << EOF
-* [master] Some fun.
- ! [mybranch] Some work.
---
-*  [master] Some fun.
- + [mybranch] Some work.
-*+ [master^] Initial commit
-EOF
-
-test_expect_success 'git show-branch (part 4)' '
-	git show-branch --topo-order > show-branch4.output &&
-	test_cmp show-branch4.expect show-branch4.output
-'
-
-test_expect_success 'manual merge' '
-	mb=$(git merge-base HEAD mybranch) &&
-	git name-rev --name-only --tags $mb > name-rev.output &&
-	test "my-first-tag" = $(cat name-rev.output) &&
-
-	git read-tree -m -u $mb HEAD mybranch
-'
-
-cat > ls-files.expect << EOF
-100644 7f8b141b65fdcee47321e399a2598a235a032422 0	example
-100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1	hello
-100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2	hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3	hello
-EOF
-
-test_expect_success 'git ls-files --stage' '
-	git ls-files --stage > ls-files.output &&
-	test_cmp ls-files.expect ls-files.output
-'
-
-cat > ls-files-unmerged.expect << EOF
-100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1	hello
-100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2	hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3	hello
-EOF
-
-test_expect_success 'git ls-files --unmerged' '
-	git ls-files --unmerged > ls-files-unmerged.output &&
-	test_cmp ls-files-unmerged.expect ls-files-unmerged.output
-'
-
-test_expect_success 'git-merge-index' '
-	test_must_fail git merge-index git-merge-one-file hello
-'
-
-test_expect_success 'git ls-files --stage (part 2)' '
-	git ls-files --stage > ls-files.output2 &&
-	test_cmp ls-files.expect ls-files.output2
-'
-
-test_expect_success 'git repack' 'git repack'
-test_expect_success 'git prune-packed' 'git prune-packed'
-test_expect_success '-> only packed objects' '
-	git prune && # Remove conflict marked blobs
-	test $(find .git/objects/[0-9a-f][0-9a-f] -type f -print 2>/dev/null | wc -l) = 0
-'
-
-test_done
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index dc98b4bc6..664a3a4e4 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -1253,7 +1253,10 @@ run_with_limited_open_files () {
 	(ulimit -n 32 && "$@")
 }
 
-test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true'
+test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_open_files true
+'
 
 test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
 (
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index eec3e90f9..9e782a812 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -129,11 +129,35 @@ test_expect_success 'symbolic-ref does not create ref d/f conflicts' '
 	test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df
 '
 
-test_expect_success 'symbolic-ref handles existing pointer to invalid name' '
+test_expect_success 'symbolic-ref can overwrite pointer to invalid name' '
+	test_when_finished reset_to_sane &&
 	head=$(git rev-parse HEAD) &&
 	git symbolic-ref HEAD refs/heads/outer &&
+	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
 	git update-ref refs/heads/outer/inner $head &&
 	git symbolic-ref HEAD refs/heads/unrelated
 '
 
+test_expect_success 'symbolic-ref can resolve d/f name (EISDIR)' '
+	test_when_finished reset_to_sane &&
+	head=$(git rev-parse HEAD) &&
+	git symbolic-ref HEAD refs/heads/outer/inner &&
+	test_when_finished "git update-ref -d refs/heads/outer" &&
+	git update-ref refs/heads/outer $head &&
+	echo refs/heads/outer/inner >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'symbolic-ref can resolve d/f name (ENOTDIR)' '
+	test_when_finished reset_to_sane &&
+	head=$(git rev-parse HEAD) &&
+	git symbolic-ref HEAD refs/heads/outer &&
+	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
+	git update-ref refs/heads/outer/inner $head &&
+	echo refs/heads/outer >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index c34ece48f..3a887b511 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -34,6 +34,81 @@ test_update_rejected () {
 
 Q="'"
 
+# Test adding and deleting D/F-conflicting references in a single
+# transaction.
+df_test() {
+	prefix="$1"
+	pack=: symadd=false symdel=false add_del=false addref= delref=
+	shift
+	while test $# -gt 0
+	do
+		case "$1" in
+		--pack)
+			pack="git pack-refs --all"
+			shift
+			;;
+		--sym-add)
+			# Perform the add via a symbolic reference
+			symadd=true
+			shift
+			;;
+		--sym-del)
+			# Perform the del via a symbolic reference
+			symdel=true
+			shift
+			;;
+		--del-add)
+			# Delete first reference then add second
+			add_del=false
+			delref="$prefix/r/$2"
+			addref="$prefix/r/$3"
+			shift 3
+			;;
+		--add-del)
+			# Add first reference then delete second
+			add_del=true
+			addref="$prefix/r/$2"
+			delref="$prefix/r/$3"
+			shift 3
+			;;
+		*)
+			echo 1>&2 "Extra args to df_test: $*"
+			return 1
+			;;
+		esac
+	done
+	git update-ref "$delref" $C &&
+	if $symadd
+	then
+		addname="$prefix/s/symadd" &&
+		git symbolic-ref "$addname" "$addref"
+	else
+		addname="$addref"
+	fi &&
+	if $symdel
+	then
+		delname="$prefix/s/symdel" &&
+		git symbolic-ref "$delname" "$delref"
+	else
+		delname="$delref"
+	fi &&
+	cat >expected-err <<-EOF &&
+	fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q
+	EOF
+	$pack &&
+	if $add_del
+	then
+		printf "%s\n" "create $addname $D" "delete $delname"
+	else
+		printf "%s\n" "delete $delname" "create $addname $D"
+	fi >commands &&
+	test_must_fail git update-ref --stdin <commands 2>output.err &&
+	test_cmp expected-err output.err &&
+	printf "%s\n" "$C $delref" >expected-refs &&
+	git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
+	test_cmp expected-refs actual-refs
+}
+
 test_expect_success 'setup' '
 
 	git commit --allow-empty -m Initial &&
@@ -188,6 +263,72 @@ test_expect_success 'empty directory should not fool 1-arg delete' '
 	git update-ref --stdin
 '
 
+test_expect_success 'D/F conflict prevents add long + delete short' '
+	df_test refs/df-al-ds --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents add short + delete long' '
+	df_test refs/df-as-dl --add-del foo foo/bar
+'
+
+test_expect_success 'D/F conflict prevents delete long + add short' '
+	df_test refs/df-dl-as --del-add foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents delete short + add long' '
+	df_test refs/df-ds-al --del-add foo foo/bar
+'
+
+test_expect_success 'D/F conflict prevents add long + delete short packed' '
+	df_test refs/df-al-dsp --pack --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents add short + delete long packed' '
+	df_test refs/df-as-dlp --pack --add-del foo foo/bar
+'
+
+test_expect_success 'D/F conflict prevents delete long packed + add short' '
+	df_test refs/df-dlp-as --pack --del-add foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents delete short packed + add long' '
+	df_test refs/df-dsp-al --pack --del-add foo foo/bar
+'
+
+# Try some combinations involving symbolic refs...
+
+test_expect_success 'D/F conflict prevents indirect add long + delete short' '
+	df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' '
+	df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' '
+	df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
+'
+
+test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' '
+	df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents indirect add long + delete short packed' '
+	df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' '
+	df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents add long + indirect delete short packed' '
+	df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
+'
+
+test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' '
+	df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
+'
+
 # Test various errors when reading the old values of references...
 
 test_expect_success 'missing old value blocks update' '
@@ -404,4 +545,77 @@ test_expect_success 'broken reference blocks indirect create' '
 	test_cmp expected output.err
 '
 
+test_expect_success 'no bogus intermediate values during delete' '
+	prefix=refs/slow-transaction &&
+	# Set up a reference with differing loose and packed versions:
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	git for-each-ref $prefix >unchanged &&
+	# Now try to update the reference, but hold the `packed-refs` lock
+	# for a while to see what happens while the process is blocked:
+	: >.git/packed-refs.lock &&
+	test_when_finished "rm -f .git/packed-refs.lock" &&
+	{
+		# Note: the following command is intentionally run in the
+		# background. We increase the timeout so that `update-ref`
+		# attempts to acquire the `packed-refs` lock for longer than
+		# it takes for us to do the check then delete it:
+		git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo &
+	} &&
+	pid2=$! &&
+	# Give update-ref plenty of time to get to the point where it tries
+	# to lock packed-refs:
+	sleep 1 &&
+	# Make sure that update-ref did not complete despite the lock:
+	kill -0 $pid2 &&
+	# Verify that the reference still has its old value:
+	sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
+	case "$sha1" in
+	$D)
+		# This is what we hope for; it means that nothing
+		# user-visible has changed yet.
+		: ;;
+	undefined)
+		# This is not correct; it means the deletion has happened
+		# already even though update-ref should not have been
+		# able to acquire the lock yet.
+		echo "$prefix/foo deleted prematurely" &&
+		break
+		;;
+	$C)
+		# This value should never be seen. Probably the loose
+		# reference has been deleted but the packed reference
+		# is still there:
+		echo "$prefix/foo incorrectly observed to be C" &&
+		break
+		;;
+	*)
+		# WTF?
+		echo "unexpected value observed for $prefix/foo: $sha1" &&
+		break
+		;;
+	esac >out &&
+	rm -f .git/packed-refs.lock &&
+	wait $pid2 &&
+	test_must_be_empty out &&
+	test_must_fail git rev-parse --verify --quiet $prefix/foo
+'
+
+test_expect_success 'delete fails cleanly if packed-refs file is locked' '
+	prefix=refs/locked-packed-refs &&
+	# Set up a reference with differing loose and packed versions:
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	git for-each-ref $prefix >unchanged &&
+	# Now try to delete it while the `packed-refs` lock is held:
+	: >.git/packed-refs.lock &&
+	test_when_finished "rm -f .git/packed-refs.lock" &&
+	test_must_fail git update-ref -d $prefix/foo >out 2>err &&
+	git for-each-ref $prefix >actual &&
+	test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+	test_cmp unchanged actual
+'
+
 test_done
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 5df06f355..8842d0329 100755
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -49,4 +49,34 @@ test_expect_success 'create_symref(FOO, refs/heads/master)' '
 	test_cmp expected actual
 '
 
+test_expect_success 'for_each_reflog()' '
+	echo $_z40 > .git/logs/PSEUDO-MAIN &&
+	mkdir -p     .git/logs/refs/bisect &&
+	echo $_z40 > .git/logs/refs/bisect/random &&
+
+	echo $_z40 > .git/worktrees/wt/logs/PSEUDO-WT &&
+	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
+	echo $_z40 > .git/worktrees/wt/logs/refs/bisect/wt-random &&
+
+	$RWT for-each-reflog | cut -c 42- | sort >actual &&
+	cat >expected <<-\EOF &&
+	HEAD 0x1
+	PSEUDO-WT 0x0
+	refs/bisect/wt-random 0x0
+	refs/heads/master 0x0
+	refs/heads/wt-master 0x0
+	EOF
+	test_cmp expected actual &&
+
+	$RMAIN for-each-reflog | cut -c 42- | sort >actual &&
+	cat >expected <<-\EOF &&
+	HEAD 0x1
+	PSEUDO-MAIN 0x0
+	refs/bisect/random 0x0
+	refs/heads/master 0x0
+	refs/heads/wt-master 0x0
+	EOF
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t1408-packed-refs.sh b/t/t1408-packed-refs.sh
new file mode 100755
index 000000000..1e44a17ee
--- /dev/null
+++ b/t/t1408-packed-refs.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+test_description='packed-refs entries are covered by loose refs'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_tick &&
+	git commit --allow-empty -m one &&
+	one=$(git rev-parse HEAD) &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git pack-refs --all &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git checkout --orphan another &&
+	test_tick &&
+	git commit --allow-empty -m two &&
+	two=$(git rev-parse HEAD) &&
+	git checkout -B master &&
+	git branch -D another &&
+
+	git for-each-ref >actual &&
+	echo "$two commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git reflog expire --expire=now --all &&
+	git prune &&
+	git tag -m v1.0 v1.0 master
+'
+
+test_expect_success 'no error from stale entry in packed-refs' '
+	git describe master >actual 2>&1 &&
+	echo "v1.0" >expect &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 03d3c7f6d..5c715fe2c 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -116,6 +116,21 @@ test_expect_success 'git-path inside sub-dir' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rev-parse --is-shallow-repository in shallow repo' '
+	test_commit test_commit &&
+	echo true >expect &&
+	git clone --depth 1 --no-local . shallow &&
+	test_when_finished "rm -rf shallow" &&
+	git -C shallow rev-parse --is-shallow-repository >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
+	echo false >expect &&
+	git rev-parse --is-shallow-repository >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'showing the superproject correctly' '
 	git rev-parse --show-superproject-working-tree >out &&
 	test_must_be_empty out &&
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index 310f93fd3..a859abedf 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -28,6 +28,9 @@ test_expect_success 'setup optionspec' '
 |g,fluf?path     short and long option optional argument
 |longest=very-long-argument-hint  a very long argument hint
 |pair=key=value  with an equals sign in the hint
+|aswitch help te=t contains? fl*g characters!`
+|bswitch=hint	 hint has trailing tab character
+|cswitch	 switch has trailing tab character
 |short-hint=a    with a one symbol hint
 |
 |Extras
@@ -35,6 +38,25 @@ test_expect_success 'setup optionspec' '
 EOF
 '
 
+test_expect_success 'setup optionspec-no-switches' '
+	sed -e "s/^|//" >optionspec_no_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+EOF
+'
+
+test_expect_success 'setup optionspec-only-hidden-switches' '
+	sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|hidden1* A hidden switch
+EOF
+'
+
 test_expect_success 'test --parseopt help output' '
 	sed -e "s/^|//" >expect <<\END_EXPECT &&
 |cat <<\EOF
@@ -62,6 +84,9 @@ test_expect_success 'test --parseopt help output' '
 |    --longest <very-long-argument-hint>
 |                          a very long argument hint
 |    --pair <key=value>    with an equals sign in the hint
+|    --aswitch             help te=t contains? fl*g characters!`
+|    --bswitch <hint>      hint has trailing tab character
+|    --cswitch             switch has trailing tab character
 |    --short-hint <a>      with a one symbol hint
 |
 |Extras
@@ -73,19 +98,100 @@ END_EXPECT
 	test_i18ncmp expect output
 '
 
+test_expect_success 'test --parseopt help output no switches' '
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
+	test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt help output hidden switches' '
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
+	test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt help-all output hidden switches' '
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|    --hidden1             A hidden switch
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
+	test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt invalid switch help output' '
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|error: unknown option `does-not-exist'\''
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|    -h, --help            show the help
+|    --foo                 some nifty option --foo
+|    --bar ...             some cool option --bar with an argument
+|    -b, --baz             a short and long option
+|
+|An option group Header
+|    -C[...]               option C with an optional argument
+|    -d, --data[=...]      short and long option with an optional argument
+|
+|Argument hints
+|    -B <arg>              short option required argument
+|    --bar2 <arg>          long option required argument
+|    -e, --fuz <with-space>
+|                          short and long option required argument
+|    -s[<some>]            short option optional argument
+|    --long[=<data>]       long option optional argument
+|    -g, --fluf[=<path>]   short and long option optional argument
+|    --longest <very-long-argument-hint>
+|                          a very long argument hint
+|    --pair <key=value>    with an equals sign in the hint
+|    --aswitch             help te=t contains? fl*g characters!`
+|    --bswitch <hint>      hint has trailing tab character
+|    --cswitch             switch has trailing tab character
+|    --short-hint <a>      with a one symbol hint
+|
+|Extras
+|    --extra1              line above used to cause a segfault but no longer does
+|
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
+	test_i18ncmp expect output
+'
+
 test_expect_success 'setup expect.1' "
 	cat > expect <<EOF
-set -- --foo --bar 'ham' -b -- 'arg'
+set -- --foo --bar 'ham' -b --aswitch -- 'arg'
 EOF
 "
 
 test_expect_success 'test --parseopt' '
-	git rev-parse --parseopt -- --foo --bar=ham --baz arg < optionspec > output &&
+	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
 	test_cmp expect output
 '
 
 test_expect_success 'test --parseopt with mixed options and arguments' '
-	git rev-parse --parseopt -- --foo arg --bar=ham --baz < optionspec > output &&
+	git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
 	test_cmp expect output
 '
 
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 9d707d2a4..503a88d02 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -117,6 +117,16 @@ test_expect_success 'git branch -m bbb should rename checked out branch' '
 	test_cmp expect actual
 '
 
+test_expect_success 'renaming checked out branch works with d/f conflict' '
+	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
+	test_when_finished git checkout master &&
+	git checkout -b foo &&
+	git branch -m foo/bar &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/foo/bar >expect &&
+	test_cmp expect actual
+'
+
 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
 	git branch o/o &&
 	git branch o/p &&
@@ -162,6 +172,19 @@ test_expect_success 'git branch -M baz bam should add entries to .git/logs/HEAD'
 	grep "^0\{40\}.*$msg$" .git/logs/HEAD
 '
 
+test_expect_success 'git branch -M should leave orphaned HEAD alone' '
+	git init orphan &&
+	(
+		cd orphan &&
+		test_commit initial &&
+		git checkout --orphan lonely &&
+		grep lonely .git/HEAD &&
+		test_path_is_missing .git/refs/head/lonely &&
+		git branch -M master mistress &&
+		grep lonely .git/HEAD
+	)
+'
+
 test_expect_success 'resulting reflog can be shown by log -g' '
 	oid=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
@@ -368,6 +391,262 @@ test_expect_success 'config information was renamed, too' '
 	test_must_fail git config branch.s/s.dummy
 '
 
+test_expect_success 'git branch -m correctly renames multiple config sections' '
+	test_when_finished "git checkout master" &&
+	git checkout -b source master &&
+
+	# Assert that a config file with multiple config sections has
+	# those sections preserved...
+	cat >expect <<-\EOF &&
+	branch.dest.key1=value1
+	some.gar.b=age
+	branch.dest.key2=value2
+	EOF
+	cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source. Tabs
+[branch "source"]
+	;; Comment for the source value
+	key1 = value1
+;; Comment for some.gar. Spaces
+[some "gar"]
+    ;; Comment for the some.gar value
+    b = age
+;; Comment for source, again. Mixed tabs/spaces.
+[branch "source"]
+    ;; Comment for the source value, again
+	key2 = value2
+EOF
+	cat config.branch >>.git/config &&
+	git branch -m source dest &&
+	git config -f .git/config -l | grep -F -e source -e dest -e some.gar >actual &&
+	test_cmp expect actual &&
+
+	# ...and that the comments for those sections are also
+	# preserved.
+	cat config.branch | sed "s/\"source\"/\"dest\"/" >expect &&
+	sed -n -e "/Note the lack/,\$p" .git/config >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git branch -c dumps usage' '
+	test_expect_code 128 git branch -c 2>err &&
+	test_i18ngrep "branch name required" err
+'
+
+test_expect_success 'git branch --copy dumps usage' '
+	test_expect_code 128 git branch --copy 2>err &&
+	test_i18ngrep "branch name required" err
+'
+
+test_expect_success 'git branch -c d e should work' '
+	git branch -l d &&
+	git reflog exists refs/heads/d &&
+	git config branch.d.dummy Hello &&
+	git branch -c d e &&
+	git reflog exists refs/heads/d &&
+	git reflog exists refs/heads/e &&
+	echo Hello >expect &&
+	git config branch.e.dummy >actual &&
+	test_cmp expect actual &&
+	echo Hello >expect &&
+	git config branch.d.dummy >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git branch --copy is a synonym for -c' '
+	git branch -l copy &&
+	git reflog exists refs/heads/copy &&
+	git config branch.copy.dummy Hello &&
+	git branch --copy copy copy-to &&
+	git reflog exists refs/heads/copy &&
+	git reflog exists refs/heads/copy-to &&
+	echo Hello >expect &&
+	git config branch.copy.dummy >actual &&
+	test_cmp expect actual &&
+	echo Hello >expect &&
+	git config branch.copy-to.dummy >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git branch -c ee ef should copy ee to create branch ef' '
+	git checkout -b ee &&
+	git reflog exists refs/heads/ee &&
+	git config branch.ee.dummy Hello &&
+	git branch -c ee ef &&
+	git reflog exists refs/heads/ee &&
+	git reflog exists refs/heads/ef &&
+	test $(git config branch.ee.dummy) = Hello &&
+	test $(git config branch.ef.dummy) = Hello &&
+	test $(git rev-parse --abbrev-ref HEAD) = ee
+'
+
+test_expect_success 'git branch -c f/f g/g should work' '
+	git branch -l f/f &&
+	git reflog exists refs/heads/f/f &&
+	git config branch.f/f.dummy Hello &&
+	git branch -c f/f g/g &&
+	git reflog exists refs/heads/f/f &&
+	git reflog exists refs/heads/g/g &&
+	test $(git config branch.f/f.dummy) = Hello &&
+	test $(git config branch.g/g.dummy) = Hello
+'
+
+test_expect_success 'git branch -c m2 m2 should work' '
+	git branch -l m2 &&
+	git reflog exists refs/heads/m2 &&
+	git config branch.m2.dummy Hello &&
+	git branch -c m2 m2 &&
+	git reflog exists refs/heads/m2 &&
+	test $(git config branch.m2.dummy) = Hello
+'
+
+test_expect_success 'git branch -c zz zz/zz should fail' '
+	git branch -l zz &&
+	git reflog exists refs/heads/zz &&
+	test_must_fail git branch -c zz zz/zz
+'
+
+test_expect_success 'git branch -c b/b b should fail' '
+	git branch -l b/b &&
+	test_must_fail git branch -c b/b b
+'
+
+test_expect_success 'git branch -C o/q o/p should work when o/p exists' '
+	git branch -l o/q &&
+	git reflog exists refs/heads/o/q &&
+	git reflog exists refs/heads/o/p &&
+	git branch -C o/q o/p
+'
+
+test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
+	git reflog exists refs/heads/o/q &&
+	git reflog exists refs/heads/o/p &&
+	git branch -c -f o/q o/p
+'
+
+test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+	git branch qq &&
+	git branch rr &&
+	test_must_fail git branch -c qq rr/qq
+'
+
+test_expect_success 'git branch -C b1 b2 should fail when b2 is checked out' '
+	git branch b1 &&
+	git checkout -b b2 &&
+	test_must_fail git branch -C b1 b2
+'
+
+test_expect_success 'git branch -C c1 c2 should succeed when c1 is checked out' '
+	git checkout -b c1 &&
+	git branch c2 &&
+	git branch -C c1 c2 &&
+	test $(git rev-parse --abbrev-ref HEAD) = c1
+'
+
+test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
+	msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
+	! grep "$msg$" .git/logs/HEAD
+'
+
+test_expect_success 'git branch -C master should work when master is checked out' '
+	git checkout master &&
+	git branch -C master
+'
+
+test_expect_success 'git branch -C master master should work when master is checked out' '
+	git checkout master &&
+	git branch -C master master
+'
+
+test_expect_success 'git branch -C master5 master5 should work when master is checked out' '
+	git checkout master &&
+	git branch master5 &&
+	git branch -C master5 master5
+'
+
+test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '
+	git branch -l cd &&
+	git reflog exists refs/heads/cd &&
+	git config branch.cd.dummy CD &&
+	git branch -l ab &&
+	git reflog exists refs/heads/ab &&
+	git config branch.ab.dummy AB &&
+	git branch -C ab cd &&
+	git reflog exists refs/heads/ab &&
+	git reflog exists refs/heads/cd &&
+	test $(git config branch.ab.dummy) = AB &&
+	test $(git config branch.cd.dummy) = AB
+'
+
+test_expect_success 'git branch -c correctly copies multiple config sections' '
+	FOO=1 &&
+	export FOO &&
+	test_when_finished "git checkout master" &&
+	git checkout -b source2 master &&
+
+	# Assert that a config file with multiple config sections has
+	# those sections preserved...
+	cat >expect <<-\EOF &&
+	branch.source2.key1=value1
+	branch.dest2.key1=value1
+	more.gar.b=age
+	branch.source2.key2=value2
+	branch.dest2.key2=value2
+	EOF
+	cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source2. Tabs
+[branch "source2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+    ;; Comment for the more.gar value
+    b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+EOF
+	cat config.branch >>.git/config &&
+	git branch -c source2 dest2 &&
+	git config -f .git/config -l | grep -F -e source2 -e dest2 -e more.gar >actual &&
+	test_cmp expect actual &&
+
+	# ...and that the comments and formatting for those sections
+	# is also preserved.
+	cat >expect <<\EOF &&
+;; Comment for source2. Tabs
+[branch "source2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[branch "dest2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+    ;; Comment for the more.gar value
+    b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+[branch "dest2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+EOF
+	sed -n -e "/Comment for source2/,\$p" .git/config >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'deleting a symref' '
 	git branch target &&
 	git symbolic-ref refs/heads/symref refs/heads/target &&
@@ -559,6 +838,7 @@ test_expect_success 'use --set-upstream-to modify HEAD' '
 test_expect_success 'use --set-upstream-to modify a particular branch' '
 	git branch my13 &&
 	git branch --set-upstream-to master my13 &&
+	test_when_finished "git branch --unset-upstream my13" &&
 	test "$(git config branch.my13.remote)" = "." &&
 	test "$(git config branch.my13.merge)" = "refs/heads/master"
 '
@@ -604,38 +884,8 @@ test_expect_success 'test --unset-upstream on a particular branch' '
 	test_must_fail git config branch.my14.merge
 '
 
-test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
-	git update-ref refs/remotes/origin/master HEAD &&
-	git branch --set-upstream origin/master 2>actual &&
-	test_when_finished git update-ref -d refs/remotes/origin/master &&
-	test_when_finished git branch -d origin/master &&
-	cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-
-If you wanted to make '"'master'"' track '"'origin/master'"', do this:
-
-    git branch -d origin/master
-    git branch --set-upstream-to origin/master
-EOF
-	test_i18ncmp expected actual
-'
-
-test_expect_success '--set-upstream with two args only shows the deprecation message' '
-	git branch --set-upstream master my13 2>actual &&
-	test_when_finished git branch --unset-upstream master &&
-	cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-EOF
-	test_i18ncmp expected actual
-'
-
-test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
-	git branch --set-upstream my13 2>actual &&
-	test_when_finished git branch --unset-upstream my13 &&
-	cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-EOF
-	test_i18ncmp expected actual
+test_expect_success '--set-upstream fails' '
+    test_must_fail git branch --set-upstream origin/master
 '
 
 test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
@@ -960,19 +1210,6 @@ test_expect_success 'attempt to delete a branch merged to its base' '
 	test_must_fail git branch -d my10
 '
 
-test_expect_success 'use set-upstream on the current branch' '
-	git checkout master &&
-	git --bare init myupstream.git &&
-	git push myupstream.git master:refs/heads/frotz &&
-	git remote add origin myupstream.git &&
-	git fetch &&
-	git branch --set-upstream master origin/frotz &&
-
-	test "z$(git config branch.master.remote)" = "zorigin" &&
-	test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
-
-'
-
 test_expect_success 'use --edit-description' '
 	write_script editor <<-\EOF &&
 		echo "New contents" >"$1"
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 9b182a0c3..afa27ffe2 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -194,6 +194,33 @@ test_expect_success 'notice d/f conflict with existing ref' '
 	test_must_fail git branch foo/bar/baz/lots/of/extra/components
 '
 
+test_expect_success 'reject packed-refs with unterminated line' '
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
+	echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+'
+
+test_expect_success 'reject packed-refs containing junk' '
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s\n" "bogus content" >>.git/packed-refs &&
+	echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+'
+
+test_expect_success 'reject packed-refs with a short SHA-1' '
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
+	printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+'
+
 test_expect_success 'timeout if packed-refs.lock exists' '
 	LOCK=.git/packed-refs.lock &&
 	>"$LOCK" &&
@@ -211,4 +238,19 @@ test_expect_success 'retry acquiring packed-refs.lock' '
 	git -c core.packedrefstimeout=3000 pack-refs --all --prune
 '
 
+test_expect_success SYMLINKS 'pack symlinked packed-refs' '
+	# First make sure that symlinking works when reading:
+	git update-ref refs/heads/loosy refs/heads/master &&
+	git for-each-ref >all-refs-before &&
+	mv .git/packed-refs .git/my-deviant-packed-refs &&
+	ln -s my-deviant-packed-refs .git/packed-refs &&
+	git for-each-ref >all-refs-linked &&
+	test_cmp all-refs-before all-refs-linked &&
+	git pack-refs --all --prune &&
+	git for-each-ref >all-refs-packed &&
+	test_cmp all-refs-before all-refs-packed &&
+	test -h .git/packed-refs &&
+	test "$(readlink .git/packed-refs)" = "my-deviant-packed-refs"
+'
+
 test_done
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 19aed7ec9..ab946a515 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -79,7 +79,7 @@ test_expect_success 'fail to merge empty notes ref into empty notes ref (z => y)
 test_expect_success 'fail to merge into various non-notes refs' '
 	test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
-	mkdir -p .git/refs/notes/dir &&
+	git update-ref refs/notes/dir/foo HEAD &&
 	test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 37821d245..3704dbb2e 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1249,20 +1249,13 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
-cat >expect <<EOF
-Warning: the command isn't recognized in the following line:
- - badcmd $(git rev-list --oneline -1 master~1)
-
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-EOF
-
 test_expect_success 'static check of bad command' '
 	rebase_setup_and_clean bad-cmd &&
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
 		git rebase -i --root 2>actual &&
-	test_i18ncmp expect actual &&
+	test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual &&
+	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
 	FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1284,20 +1277,13 @@ test_expect_success 'tabs and spaces are accepted in the todolist' '
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
-cat >expect <<EOF
-Warning: the SHA-1 is missing or isn't a commit in the following line:
- - edit XXXXXXX False commit
-
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-EOF
-
 test_expect_success 'static check of bad SHA-1' '
 	rebase_setup_and_clean bad-sha &&
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
 		git rebase -i --root 2>actual &&
-	test_i18ncmp expect actual &&
+	test_i18ngrep "edit XXXXXXX False commit" actual &&
+	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
 	FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 5848949ec..e364c1262 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -271,6 +271,18 @@ test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '
 	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
 '
 
+test_expect_success 'autosquash with empty custom instructionFormat' '
+	git reset --hard base &&
+	test_commit empty-instructionFormat-test &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git -c rebase.instructionFormat= \
+			rebase --autosquash  --force -i HEAD^ >actual &&
+		git log -1 --format="pick %h %s" >expect &&
+		test_cmp expect actual
+	)
+'
+
 set_backup_editor () {
 	write_script backup-editor.sh <<-\EOF
 	cp "$1" .git/backup-"$(basename "$1")"
@@ -278,7 +290,7 @@ set_backup_editor () {
 	test_set_editor "$PWD/backup-editor.sh"
 }
 
-test_expect_failure 'autosquash with multiple empty patches' '
+test_expect_success 'autosquash with multiple empty patches' '
 	test_tick &&
 	git commit --allow-empty -m "empty" &&
 	test_tick &&
@@ -304,4 +316,18 @@ test_expect_success 'extra spaces after fixup!' '
 	test $base = $parent
 '
 
+test_expect_success 'wrapped original subject' '
+	if test -d .git/rebase-merge; then git rebase --abort; fi &&
+	base=$(git rev-parse HEAD) &&
+	echo "wrapped subject" >wrapped &&
+	git add wrapped &&
+	test_tick &&
+	git commit --allow-empty -m "$(printf "To\nfixup")" &&
+	test_tick &&
+	git commit --allow-empty -m "fixup! To fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
+'
+
 test_done
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 4046817d7..3b1ac1971 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -444,6 +444,14 @@ test_expect_failure 'stash file to directory' '
 	test foo = "$(cat file/file)"
 '
 
+test_expect_success 'stash create - no changes' '
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	git stash create >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'stash branch - no stashes on stack, stash-like argument' '
 	git stash clear &&
 	test_when_finished "git reset --hard HEAD" &&
@@ -648,6 +656,20 @@ test_expect_success 'stash branch should not drop the stash if the branch exists
 	git rev-parse stash@{0} --
 '
 
+test_expect_success 'stash branch should not drop the stash if the apply fails' '
+	git stash clear &&
+	git reset HEAD~1 --hard &&
+	echo foo >file &&
+	git add file &&
+	git commit -m initial &&
+	echo bar >file &&
+	git stash &&
+	echo baz >file &&
+	test_when_finished "git checkout master" &&
+	test_must_fail git stash branch new_branch stash@{0} &&
+	git rev-parse stash@{0} --
+'
+
 test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
 	git stash clear &&
 	echo 1 >subdir/subfile1 &&
@@ -800,6 +822,18 @@ test_expect_success 'create with multiple arguments for the message' '
 	test_cmp expect actual
 '
 
+test_expect_success 'create in a detached state' '
+	test_when_finished "git checkout master" &&
+	git checkout HEAD~1 &&
+	>foo &&
+	git add foo &&
+	STASH_ID=$(git stash create) &&
+	HEAD_ID=$(git rev-parse --short HEAD) &&
+	echo "WIP on (no branch): ${HEAD_ID} initial" >expect &&
+	git show --pretty=%s -s ${STASH_ID} >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'stash -- <pathspec> stashes and restores the file' '
 	>foo &&
 	>bar &&
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 193adc7b6..bfde4057a 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -211,4 +211,21 @@ test_expect_success 'stash push with $IFS character' '
 	test_path_is_file bar
 '
 
+cat > .gitignore <<EOF
+ignored
+ignored.d/*
+EOF
+
+test_expect_success 'stash previously ignored file' '
+	git reset HEAD &&
+	git add .gitignore &&
+	git commit -m "Add .gitignore" &&
+	>ignored.d/foo &&
+	echo "!ignored.d/foo" >> .gitignore &&
+	git stash save --include-untracked &&
+	test_path_is_missing ignored.d/foo &&
+	git stash pop &&
+	test_path_is_file ignored.d/foo
+'
+
 test_done
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index d09acfe48..c515e3e53 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -90,6 +90,14 @@ test_expect_success setup '
 	git commit -m "Rearranged lines in dir/sub" &&
 	git checkout master &&
 
+	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+	git checkout -b mode initial &&
+	git update-index --chmod=+x file0 &&
+	git commit -m "update mode" &&
+	git checkout -f master &&
+
 	git config diff.renames false &&
 
 	git show-branch
@@ -192,6 +200,10 @@ diff-tree --pretty side
 diff-tree --pretty -p side
 diff-tree --pretty --patch-with-stat side
 
+diff-tree initial mode
+diff-tree --stat initial mode
+diff-tree --summary initial mode
+
 diff-tree master
 diff-tree -p master
 diff-tree -p -m master
diff --git a/t/t4013/diff.diff-tree_--stat_initial_mode b/t/t4013/diff.diff-tree_--stat_initial_mode
new file mode 100644
index 000000000..0e5943c2c
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--stat_initial_mode
@@ -0,0 +1,4 @@
+$ git diff-tree --stat initial mode
+ file0 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+$
diff --git a/t/t4013/diff.diff-tree_--summary_initial_mode b/t/t4013/diff.diff-tree_--summary_initial_mode
new file mode 100644
index 000000000..25846b6af
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--summary_initial_mode
@@ -0,0 +1,3 @@
+$ git diff-tree --summary initial mode
+ mode change 100644 => 100755 file0
+$
diff --git a/t/t4013/diff.diff-tree_initial_mode b/t/t4013/diff.diff-tree_initial_mode
new file mode 100644
index 000000000..c47c09423
--- /dev/null
+++ b/t/t4013/diff.diff-tree_initial_mode
@@ -0,0 +1,3 @@
+$ git diff-tree initial mode
+:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M	file0
+$
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index b345b2ebf..2afe91f11 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -1,4 +1,10 @@
 $ git log --decorate=full --all
+commit b7e0bc69303b488b47deca799a7d723971dfa6cd (refs/heads/mode)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode
+
 commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange)
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:06:00 2006 +0000
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index 3aa16a9e4..d0f308ab2 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -1,4 +1,10 @@
 $ git log --decorate --all
+commit b7e0bc69303b488b47deca799a7d723971dfa6cd (mode)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode
+
 commit cd4e72fd96faed3f0ba949dc42967430374e2290 (rearrange)
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:06:00 2006 +0000
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 94597ff28..87083f728 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -155,7 +155,7 @@ test_expect_success 'ignore-blank-lines: only new lines' '
 " >x &&
 	git diff --ignore-blank-lines >out &&
 	>expect &&
-	test_cmp out expect
+	test_cmp expect out
 '
 
 test_expect_success 'ignore-blank-lines: only new lines with space' '
@@ -165,7 +165,7 @@ test_expect_success 'ignore-blank-lines: only new lines with space' '
  " >x &&
 	git diff -w --ignore-blank-lines >out &&
 	>expect &&
-	test_cmp out expect
+	test_cmp expect out
 '
 
 test_expect_success 'ignore-blank-lines: after change' '
@@ -802,7 +802,6 @@ test_expect_success 'combined diff with autocrlf conversion' '
 # Start testing the colored format for whitespace checks
 
 test_expect_success 'setup diff colors' '
-	git config color.diff always &&
 	git config color.diff.plain normal &&
 	git config color.diff.meta bold &&
 	git config color.diff.frag cyan &&
@@ -972,4 +971,572 @@ test_expect_success 'option overrides diff.wsErrorHighlight' '
 
 '
 
+test_expect_success 'detect moved code, complete file' '
+	git reset --hard &&
+	cat <<-\EOF >test.c &&
+	#include<stdio.h>
+	main()
+	{
+	printf("Hello World");
+	}
+	EOF
+	git add test.c &&
+	git commit -m "add main function" &&
+	git mv test.c main.c &&
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	git diff HEAD --color-moved=zebra --color --no-renames | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>new file mode 100644<RESET>
+	<BOLD>index 0000000..a986c57<RESET>
+	<BOLD>--- /dev/null<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -0,0 +1,5 @@<RESET>
+	<BGREEN>+<RESET><BGREEN>#include<stdio.h><RESET>
+	<BGREEN>+<RESET><BGREEN>main()<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<BGREEN>+<RESET><BGREEN>printf("Hello World");<RESET>
+	<BGREEN>+<RESET><BGREEN>}<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>deleted file mode 100644<RESET>
+	<BOLD>index a986c57..0000000<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ /dev/null<RESET>
+	<CYAN>@@ -1,5 +0,0 @@<RESET>
+	<BRED>-#include<stdio.h><RESET>
+	<BRED>-main()<RESET>
+	<BRED>-{<RESET>
+	<BRED>-printf("Hello World");<RESET>
+	<BRED>-}<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success 'detect malicious moved code, inside file' '
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	git reset --hard &&
+	cat <<-\EOF >main.c &&
+		#include<stdio.h>
+		int stuff()
+		{
+			printf("Hello ");
+			printf("World\n");
+		}
+
+		int secure_foo(struct user *u)
+		{
+			if (!u->is_allowed_foo)
+				return;
+			foo(u);
+		}
+
+		int main()
+		{
+			foo();
+		}
+	EOF
+	cat <<-\EOF >test.c &&
+		#include<stdio.h>
+		int bar()
+		{
+			printf("Hello World, but different\n");
+		}
+
+		int another_function()
+		{
+			bar();
+		}
+	EOF
+	git add main.c test.c &&
+	git commit -m "add main and test file" &&
+	cat <<-\EOF >main.c &&
+		#include<stdio.h>
+		int stuff()
+		{
+			printf("Hello ");
+			printf("World\n");
+		}
+
+		int main()
+		{
+			foo();
+		}
+	EOF
+	cat <<-\EOF >test.c &&
+		#include<stdio.h>
+		int bar()
+		{
+			printf("Hello World, but different\n");
+		}
+
+		int secure_foo(struct user *u)
+		{
+			foo(u);
+			if (!u->is_allowed_foo)
+				return;
+		}
+
+		int another_function()
+		{
+			bar();
+		}
+	EOF
+	git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>--- a/main.c<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+	 printf("World\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BRED>-int secure_foo(struct user *u)<RESET>
+	<BRED>-{<RESET>
+	<BLUE>-if (!u->is_allowed_foo)<RESET>
+	<BLUE>-return;<RESET>
+	<RED>-foo(u);<RESET>
+	<RED>-}<RESET>
+	<RED>-<RESET>
+	 int main()<RESET>
+	 {<RESET>
+	 foo();<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ b/test.c<RESET>
+	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+	 printf("Hello World, but different\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<GREEN>+<RESET><GREEN>foo(u);<RESET>
+	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+	<BGREEN>+<RESET><BGREEN>return;<RESET>
+	<GREEN>+<RESET><GREEN>}<RESET>
+	<GREEN>+<RESET>
+	 int another_function()<RESET>
+	 {<RESET>
+	 bar();<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success 'plain moved code, inside file' '
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	# needs previous test as setup
+	git diff HEAD --no-renames --color-moved=plain --color | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>--- a/main.c<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+	 printf("World\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BRED>-int secure_foo(struct user *u)<RESET>
+	<BRED>-{<RESET>
+	<BRED>-if (!u->is_allowed_foo)<RESET>
+	<BRED>-return;<RESET>
+	<BRED>-foo(u);<RESET>
+	<BRED>-}<RESET>
+	<BRED>-<RESET>
+	 int main()<RESET>
+	 {<RESET>
+	 foo();<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ b/test.c<RESET>
+	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+	 printf("Hello World, but different\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<BGREEN>+<RESET><BGREEN>foo(u);<RESET>
+	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+	<BGREEN>+<RESET><BGREEN>return;<RESET>
+	<BGREEN>+<RESET><BGREEN>}<RESET>
+	<BGREEN>+<RESET>
+	 int another_function()<RESET>
+	 {<RESET>
+	 bar();<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success 'detect permutations inside moved code -- dimmed_zebra' '
+	git reset --hard &&
+	cat <<-\EOF >lines.txt &&
+		long line 1
+		long line 2
+		long line 3
+		line 4
+		line 5
+		line 6
+		line 7
+		line 8
+		line 9
+		line 10
+		line 11
+		line 12
+		line 13
+		long line 14
+		long line 15
+		long line 16
+	EOF
+	git add lines.txt &&
+	git commit -m "add poetry" &&
+	cat <<-\EOF >lines.txt &&
+		line 4
+		line 5
+		line 6
+		line 7
+		line 8
+		line 9
+		long line 1
+		long line 2
+		long line 3
+		long line 14
+		long line 15
+		long line 16
+		line 10
+		line 11
+		line 12
+		line 13
+	EOF
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	test_config color.diff.oldMovedDimmed "normal magenta" &&
+	test_config color.diff.newMovedDimmed "normal cyan" &&
+	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+	git diff HEAD --no-renames --color-moved=dimmed_zebra --color |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<BMAGENTA>-long line 1<RESET>
+	<BMAGENTA>-long line 2<RESET>
+	<BMAGENTA>-long line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	 line 6<RESET>
+	 line 7<RESET>
+	 line 8<RESET>
+	 line 9<RESET>
+	<BCYAN>+<RESET><BCYAN>long line 1<RESET>
+	<BCYAN>+<RESET><BCYAN>long line 2<RESET>
+	<CYAN>+<RESET><CYAN>long line 3<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
+	<BYELLOW>+<RESET><BYELLOW>long line 15<RESET>
+	<BYELLOW>+<RESET><BYELLOW>long line 16<RESET>
+	 line 10<RESET>
+	 line 11<RESET>
+	 line 12<RESET>
+	 line 13<RESET>
+	<BMAGENTA>-long line 14<RESET>
+	<BMAGENTA>-long line 15<RESET>
+	<BMAGENTA>-long line 16<RESET>
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'cmd option assumes configured colored-moved' '
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	test_config color.diff.oldMovedDimmed "normal magenta" &&
+	test_config color.diff.newMovedDimmed "normal cyan" &&
+	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+	test_config diff.colorMoved zebra &&
+	git diff HEAD --no-renames --color-moved --color |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<MAGENTA>-long line 1<RESET>
+	<MAGENTA>-long line 2<RESET>
+	<MAGENTA>-long line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	 line 6<RESET>
+	 line 7<RESET>
+	 line 8<RESET>
+	 line 9<RESET>
+	<CYAN>+<RESET><CYAN>long line 1<RESET>
+	<CYAN>+<RESET><CYAN>long line 2<RESET>
+	<CYAN>+<RESET><CYAN>long line 3<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 15<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 16<RESET>
+	 line 10<RESET>
+	 line 11<RESET>
+	 line 12<RESET>
+	 line 13<RESET>
+	<MAGENTA>-long line 14<RESET>
+	<MAGENTA>-long line 15<RESET>
+	<MAGENTA>-long line 16<RESET>
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'no effect from --color-moved with --word-diff' '
+	cat <<-\EOF >text.txt &&
+	Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+	EOF
+	git add text.txt &&
+	git commit -a -m "clean state" &&
+	cat <<-\EOF >text.txt &&
+	simply Lorem Ipsum dummy is text of the typesetting and printing industry.
+	EOF
+	git diff --color-moved --word-diff >actual &&
+	git diff --word-diff >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'move detection ignoring whitespace ' '
+	git reset --hard &&
+	cat <<\EOF >lines.txt &&
+line 1
+line 2
+line 3
+line 4
+long line 5
+long line 6
+long line 7
+EOF
+	git add lines.txt &&
+	git commit -m "add poetry" &&
+	cat <<\EOF >lines.txt &&
+	long line 5
+	long line 6
+	long line 7
+line 1
+line 2
+line 3
+line 4
+EOF
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	git diff HEAD --no-renames --color-moved --color |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,7 +1,7 @@<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 5<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 6<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 7<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	<RED>-long line 5<RESET>
+	<RED>-long line 6<RESET>
+	<RED>-long line 7<RESET>
+	EOF
+	test_cmp expected actual &&
+
+	git diff HEAD --no-renames -w --color-moved --color |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,7 +1,7 @@<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 5<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 6<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 7<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	<MAGENTA>-long line 5<RESET>
+	<MAGENTA>-long line 6<RESET>
+	<MAGENTA>-long line 7<RESET>
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success '--color-moved block at end of diff output respects MIN_ALNUM_COUNT' '
+	git reset --hard &&
+	>bar &&
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	line1
+	EOF
+	git add foo bar &&
+	git commit -m x &&
+
+	cat <<-\EOF >bar &&
+	line1
+	EOF
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
+
+	git diff HEAD --color-moved=zebra --color --no-renames |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1 @@<RESET>
+	<GREEN>+<RESET><GREEN>line1<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,2 +1 @@<RESET>
+	 irrelevant_line<RESET>
+	<RED>-line1<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success '--color-moved respects MIN_ALNUM_COUNT' '
+	git reset --hard &&
+	cat <<-\EOF >foo &&
+	nineteen chars 456789
+	irrelevant_line
+	twenty chars 234567890
+	EOF
+	>bar &&
+	git add foo bar &&
+	git commit -m x &&
+
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
+	cat <<-\EOF >bar &&
+	twenty chars 234567890
+	nineteen chars 456789
+	EOF
+
+	git diff HEAD --color-moved=zebra --color --no-renames |
+		grep -v "index" |
+		test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1,2 @@<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>twenty chars 234567890<RESET>
+	<GREEN>+<RESET><GREEN>nineteen chars 456789<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,3 +1 @@<RESET>
+	<RED>-nineteen chars 456789<RESET>
+	 irrelevant_line<RESET>
+	<BOLD;MAGENTA>-twenty chars 234567890<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success '--color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT' '
+	git reset --hard &&
+	cat <<-\EOF >foo &&
+	7charsA
+	irrelevant_line
+	7charsB
+	7charsC
+	EOF
+	>bar &&
+	git add foo bar &&
+	git commit -m x &&
+
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
+	cat <<-\EOF >bar &&
+	7charsB
+	7charsC
+	7charsA
+	EOF
+
+	git diff HEAD --color-moved=zebra --color --no-renames | grep -v "index" | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1,3 @@<RESET>
+	<GREEN>+<RESET><GREEN>7charsB<RESET>
+	<GREEN>+<RESET><GREEN>7charsC<RESET>
+	<GREEN>+<RESET><GREEN>7charsA<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,4 +1 @@<RESET>
+	<RED>-7charsA<RESET>
+	 irrelevant_line<RESET>
+	<RED>-7charsB<RESET>
+	<RED>-7charsC<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
+test_expect_success 'move detection with submodules' '
+	test_create_repo bananas &&
+	echo ripe >bananas/recipe &&
+	git -C bananas add recipe &&
+	test_commit fruit &&
+	test_commit -C bananas recipe &&
+	git submodule add ./bananas &&
+	git add bananas &&
+	git commit -a -m "bananas are like a heavy library?" &&
+	echo foul >bananas/recipe &&
+	echo ripe >fruit.t &&
+
+	git diff --submodule=diff --color-moved --color >actual &&
+
+	# no move detection as the moved line is across repository boundaries.
+	test_decode_color <actual >decoded_actual &&
+	! grep BGREEN decoded_actual &&
+	! grep BRED decoded_actual &&
+
+	# nor did we mess with it another way
+	git diff --submodule=diff --color | test_decode_color >expect &&
+	test_cmp expect decoded_actual
+'
+
+test_expect_success 'move detection with whitespace changes' '
+	test_when_finished "git reset --hard" &&
+	test_seq 10 >test &&
+	git add test &&
+	sed s/3/42/ <test >test.tmp &&
+	mv test.tmp test &&
+	git -c diff.colormoved diff --ignore-space-change -- test
+'
+
 test_done
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 518bf9524..2ffd11a14 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -113,35 +113,6 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
 	! test -s actual4
 '
 
-test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.git/config]' '
-	git config diff.ignoreSubmodules all &&
-	git diff HEAD >actual &&
-	! test -s actual &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config submodule.subname.ignore all &&
-	git diff HEAD >actual2 &&
-	! test -s actual2 &&
-	git config submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git config submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	! test -s actual4 &&
-	git diff HEAD --ignore-submodules=none >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --unset diff.ignoreSubmodules
-'
-
 test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
 	git config diff.ignoreSubmodules dirty &&
 	git diff HEAD >actual &&
@@ -208,24 +179,6 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
 	! test -s actual4
 '
 
-test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.git/config]' '
-	git config submodule.subname.ignore all &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	! test -s actual2 &&
-	git config submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	! test -s actual3 &&
-	git config submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	! test -s actual4 &&
-	git diff --ignore-submodules=none HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname
-'
-
 test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
 	git config --add -f .gitmodules submodule.subname.ignore all &&
 	git config --add -f .gitmodules submodule.subname.path sub &&
@@ -261,26 +214,6 @@ test_expect_success 'git diff between submodule commits' '
 	! test -s actual
 '
 
-test_expect_success 'git diff between submodule commits [.git/config]' '
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config submodule.subname.ignore dirty &&
-	git config submodule.subname.path sub &&
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config submodule.subname.ignore all &&
-	git diff HEAD^..HEAD >actual &&
-	! test -s actual &&
-	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	git config --remove-section submodule.subname
-'
-
 test_expect_success 'git diff between submodule commits [.gitmodules]' '
 	git diff HEAD^..HEAD >actual &&
 	sed -e "1,/^@@/d" actual >actual.body &&
diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh
index cd70fd519..49bca7b48 100755
--- a/t/t4059-diff-submodule-not-initialized.sh
+++ b/t/t4059-diff-submodule-not-initialized.sh
@@ -95,7 +95,7 @@ test_expect_success 'submodule not initialized in new clone' '
 	git clone . sm3 &&
 	git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1...$smhead2 (not initialized)
+	Submodule sm1 $smhead1...$smhead2 (commits not present)
 	EOF
 	test_cmp expected actual
 '
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 1a080e782..d97d2bebc 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -239,6 +239,43 @@ test_expect_success 'old records rest in peace' '
 	! test -f $rr2/preimage
 '
 
+rerere_gc_custom_expiry_test () {
+	five_days="$1" right_now="$2"
+	test_expect_success "rerere gc with custom expiry ($five_days, $right_now)" '
+		rm -fr .git/rr-cache &&
+		rr=.git/rr-cache/$_z40 &&
+		mkdir -p "$rr" &&
+		>"$rr/preimage" &&
+		>"$rr/postimage" &&
+
+		two_days_ago=$((-2*86400)) &&
+		test-chmtime =$two_days_ago "$rr/preimage" &&
+		test-chmtime =$two_days_ago "$rr/postimage" &&
+
+		find .git/rr-cache -type f | sort >original &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$five_days" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$right_now" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		>expect &&
+		test_cmp expect actual
+	'
+}
+
+rerere_gc_custom_expiry_test 5 0
+
+rerere_gc_custom_expiry_test 5.days.ago now
+
 test_expect_success 'setup: file2 added differently in two branches' '
 	git reset --hard &&
 
@@ -419,24 +456,6 @@ count_pre_post () {
 	test_line_count = "$2" actual
 }
 
-test_expect_success 'rerere gc' '
-	find .git/rr-cache -type f >original &&
-	xargs test-chmtime -172800 <original &&
-
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
-	find .git/rr-cache -type f >actual &&
-	test_cmp original actual &&
-
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
-	find .git/rr-cache -type f >actual &&
-	test_cmp original actual &&
-
-	git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
-	find .git/rr-cache -type f >actual &&
-	>expect &&
-	test_cmp expect actual
-'
-
 merge_conflict_resolve () {
 	git reset --hard &&
 	test_must_fail git merge six.1 &&
@@ -446,6 +465,8 @@ merge_conflict_resolve () {
 }
 
 test_expect_success 'multiple identical conflicts' '
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
 	git reset --hard &&
 
 	test_seq 1 6 >early &&
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 18aa1b588..591f35daa 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -539,25 +539,62 @@ cat >trailers <<EOF
 Signed-off-by: A U Thor <author@example.com>
 Acked-by: A U Thor <author@example.com>
 [ v2 updated patch description ]
-Signed-off-by: A U Thor <author@example.com>
+Signed-off-by: A U Thor
+  <author@example.com>
 EOF
 
-test_expect_success 'pretty format %(trailers) shows trailers' '
+unfold () {
+	perl -0pe 's/\n\s+/ /g'
+}
+
+test_expect_success 'set up trailer tests' '
 	echo "Some contents" >trailerfile &&
 	git add trailerfile &&
-	git commit -F - <<-EOF &&
+	git commit -F - <<-EOF
 	trailers: this commit message has trailers
 
 	This commit is a test commit with trailers at the end. We parse this
-	message and display the trailers using %bT
+	message and display the trailers using %(trailers).
 
 	$(cat trailers)
 	EOF
+'
+
+test_expect_success 'pretty format %(trailers) shows trailers' '
 	git log --no-walk --pretty="%(trailers)" >actual &&
-	cat >expect <<-EOF &&
-	$(cat trailers)
+	{
+		cat trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
 
-	EOF
+test_expect_success '%(trailers:only) shows only "key: value" trailers' '
+	git log --no-walk --pretty="%(trailers:only)" >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers:unfold) unfolds trailers' '
+	git log --no-walk --pretty="%(trailers:unfold)" >actual &&
+	{
+		unfold <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success ':only and :unfold work together' '
+	git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
+	git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
 	test_cmp expect actual
 '
 
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 133b5842b..6694c19a1 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -283,4 +283,41 @@ test_expect_success 'prune: handle alternate object database' '
 	git -C B prune
 '
 
+test_expect_success 'prune: handle index in multiple worktrees' '
+	git worktree add second-worktree &&
+	echo "new blob for second-worktree" >second-worktree/blob &&
+	git -C second-worktree add blob &&
+	git prune --expire=now &&
+	git -C second-worktree show :blob >actual &&
+	test_cmp second-worktree/blob actual
+'
+
+test_expect_success 'prune: handle HEAD in multiple worktrees' '
+	git worktree add --detach third-worktree &&
+	echo "new blob for third-worktree" >third-worktree/blob &&
+	git -C third-worktree add blob &&
+	git -C third-worktree commit -m "third" &&
+	rm .git/worktrees/third-worktree/index &&
+	test_must_fail git -C third-worktree show :blob &&
+	git prune --expire=now &&
+	git -C third-worktree show HEAD:blob >actual &&
+	test_cmp third-worktree/blob actual
+'
+
+test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
+	git config core.logAllRefUpdates true &&
+	echo "lost blob for third-worktree" >expected &&
+	(
+		cd third-worktree &&
+		cat ../expected >blob &&
+		git add blob &&
+		git commit -m "second commit in third" &&
+		git reset --hard HEAD^
+	) &&
+	git prune --expire=now &&
+	SHA1=`git hash-object expected` &&
+	git -C third-worktree show "$SHA1" >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index f15f7a332..59c4b778d 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -305,7 +305,7 @@ test_expect_success '--rebase with conflicts shows advice' '
 	test_tick &&
 	git commit -m "Create conflict" seq.txt &&
 	test_must_fail git pull --rebase . seq 2>err >out &&
-	test_i18ngrep "When you have resolved this problem" out
+	test_i18ngrep "Resolve all conflicts manually" out
 '
 
 test_expect_success 'failed --rebase shows advice' '
@@ -319,7 +319,7 @@ test_expect_success 'failed --rebase shows advice' '
 	git checkout -f -b fails-to-rebase HEAD^ &&
 	test_commit v2-without-cr file "2" file2-lf &&
 	test_must_fail git pull --rebase . diverging 2>err >out &&
-	test_i18ngrep "When you have resolved this problem" out
+	test_i18ngrep "Resolve all conflicts manually" out
 '
 
 test_expect_success '--rebase fails with multiple branches' '
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 0f84a5314..39cb2c1c3 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -298,6 +298,16 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
 	)
 '
 
+test_expect_success 'submodule entry pointing at a tag is error' '
+	git -C work/gar/bage tag -a test1 -m "tag" &&
+	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
+	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
+	git -C work commit -m "bad commit" &&
+	test_when_finished "git -C work reset --hard HEAD^" &&
+	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&
+	test_i18ngrep "is a tag, not a commit" err
+'
+
 test_expect_success 'push fails if recurse submodules option passed as yes' '
 	(
 		cd work/gar/bage &&
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 464ffdd14..1cea758f7 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -71,6 +71,13 @@ test_expect_success 'push --signed fails with a receiver without push certificat
 	test_i18ngrep "the receiving end does not support" err
 '
 
+test_expect_success 'push --signed=1 is accepted' '
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
+	test_i18ngrep "the receiving end does not support" err
+'
+
 test_expect_success GPG 'no certificate for a signed push with no update' '
 	prepare_dst &&
 	mkdir -p dst/.git/hooks &&
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 077eb07e1..321bd37de 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -65,6 +65,38 @@ test_expect_success 'recursive pull updates working tree' '
 	test_path_is_file super/sub/merge_strategy.t
 '
 
+test_expect_success "submodule.recurse option triggers recursive pull" '
+	test_commit -C child merge_strategy_2 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
+
+	git -C super -c submodule.recurse pull --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_2.t
+'
+
+test_expect_success " --[no-]recurse-submodule and submodule.recurse" '
+	test_commit -C child merge_strategy_3 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
+
+	git -C super -c submodule.recurse pull --no-recurse-submodules --no-rebase &&
+	test_path_is_missing super/sub/merge_strategy_3.t &&
+	git -C super -c submodule.recurse=false pull --recurse-submodules --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_3.t &&
+
+	test_commit -C child merge_strategy_4 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
+
+	git -C super -c submodule.recurse=false pull --no-recurse-submodules --no-rebase &&
+	test_path_is_missing super/sub/merge_strategy_4.t &&
+	git -C super -c submodule.recurse=true pull --recurse-submodules --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_4.t
+'
+
 test_expect_success 'recursive rebasing pull' '
 	# change upstream
 	test_commit -C child rebase_strategy &&
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 295974519..f0268372d 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -57,7 +57,7 @@ test_expect_success '--left-right' '
 	git rev-list --left-right B...C > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 test_expect_success '--count' '
@@ -77,14 +77,14 @@ test_expect_success '--cherry-pick bar does not come up empty' '
 	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 test_expect_success 'bar does not come up empty' '
 	git rev-list --left-right B...C -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -96,14 +96,14 @@ test_expect_success '--cherry-pick bar does not come up empty (II)' '
 	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 test_expect_success 'name-rev multiple --refs combine inclusive' '
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
 	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" \
 		<actual >actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -115,7 +115,7 @@ test_expect_success 'name-rev --refs excludes non-matched patterns' '
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
 	git name-rev --stdin --name-only --refs="*tags/F" \
 		<actual >actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -127,14 +127,14 @@ test_expect_success 'name-rev --exclude excludes matched patterns' '
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" --exclude="*E" \
 		<actual >actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 test_expect_success 'name-rev --no-refs clears the refs list' '
 	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
 	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
 		<expect >actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 cat >expect <<EOF
@@ -148,7 +148,7 @@ test_expect_success '--cherry-mark' '
 	git rev-list --cherry-mark F...E -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -162,7 +162,7 @@ test_expect_success '--cherry-mark --left-right' '
 	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -173,14 +173,14 @@ test_expect_success '--cherry-pick --right-only' '
 	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 test_expect_success '--cherry-pick --left-only' '
 	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -192,7 +192,7 @@ test_expect_success '--cherry' '
 	git rev-list --cherry F...E -- bar > actual &&
 	git name-rev --stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
-	test_cmp actual.named expect
+	test_cmp expect actual.named
 '
 
 cat >expect <<EOF
@@ -201,7 +201,7 @@ EOF
 
 test_expect_success '--cherry --count' '
 	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 cat >expect <<EOF
@@ -210,7 +210,7 @@ EOF
 
 test_expect_success '--cherry-mark --count' '
 	git rev-list --cherry-mark --count F...E -- bar > actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 cat >expect <<EOF
@@ -219,7 +219,7 @@ EOF
 
 test_expect_success '--cherry-mark --left-right --count' '
 	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 test_expect_success '--cherry-pick with independent, but identical branches' '
diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 59fc2f06e..89458d370 100755
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -28,7 +28,7 @@ test_expect_success '--reverse --parents --full-history combines correctly' '
 		perl -e "print reverse <>" > expected &&
 	git rev-list --reverse --parents --full-history master -- foo \
 		> actual &&
-	test_cmp actual expected
+	test_cmp expected actual
 	'
 
 test_expect_success '--boundary does too' '
@@ -36,7 +36,7 @@ test_expect_success '--boundary does too' '
 		perl -e "print reverse <>" > expected &&
 	git rev-list --boundary --reverse --parents --full-history \
 		master ^root -- foo > actual &&
-	test_cmp actual expected
+	test_cmp expected actual
 	'
 
 test_done
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 97a07655a..8f17fd9da 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -100,7 +100,7 @@ test_expect_success 'checkout (up-to-date with upstream)' '
 	(
 		cd test && git checkout b6
 	) >actual &&
-	test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+	test_i18ngrep "Your branch is up to date with .origin/master" actual
 '
 
 test_expect_success 'status (diverged from upstream)' '
@@ -130,7 +130,7 @@ test_expect_success 'status (up-to-date with upstream)' '
 		# reports nothing to commit
 		test_must_fail git commit --dry-run
 	) >actual &&
-	test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+	test_i18ngrep "Your branch is up to date with .origin/master" actual
 '
 
 cat >expect <<\EOF
@@ -188,35 +188,29 @@ test_expect_success 'fail to track annotated tags' '
 	test_must_fail git checkout heavytrack
 '
 
-test_expect_success 'setup tracking with branch --set-upstream on existing branch' '
+test_expect_success '--set-upstream-to does not change branch' '
 	git branch from-master master &&
-	test_must_fail git config branch.from-master.merge > actual &&
-	git branch --set-upstream from-master master &&
-	git config branch.from-master.merge > actual &&
-	grep -q "^refs/heads/master$" actual
-'
-
-test_expect_success '--set-upstream does not change branch' '
+	git branch --set-upstream-to master from-master &&
 	git branch from-master2 master &&
 	test_must_fail git config branch.from-master2.merge > actual &&
 	git rev-list from-master2 &&
 	git update-ref refs/heads/from-master2 from-master2^ &&
 	git rev-parse from-master2 >expect2 &&
-	git branch --set-upstream from-master2 master &&
+	git branch --set-upstream-to master from-master2 &&
 	git config branch.from-master.merge > actual &&
 	git rev-parse from-master2 >actual2 &&
 	grep -q "^refs/heads/master$" actual &&
 	cmp expect2 actual2
 '
 
-test_expect_success '--set-upstream @{-1}' '
-	git checkout from-master &&
+test_expect_success '--set-upstream-to @{-1}' '
+	git checkout follower &&
 	git checkout from-master2 &&
 	git config branch.from-master2.merge > expect2 &&
-	git branch --set-upstream @{-1} follower &&
+	git branch --set-upstream-to @{-1} from-master &&
 	git config branch.from-master.merge > actual &&
 	git config branch.from-master2.merge > actual2 &&
-	git branch --set-upstream from-master follower &&
+	git branch --set-upstream-to follower from-master &&
 	git config branch.from-master.merge > expect &&
 	test_cmp expect2 actual2 &&
 	test_cmp expect actual
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 25110ea55..1c0e8659d 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -190,6 +190,33 @@ check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="te
 
 check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD
 
+test_expect_success 'set-up branches' '
+	git branch branch_A A &&
+	git branch branch_C c &&
+	git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
+	git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
+	git update-ref refs/original/original_branch_A test-annotated~2
+'
+
+check_describe "heads/branch_A*" --all --match="branch_*" --exclude="branch_C" HEAD
+
+check_describe "remotes/origin/remote_branch_A*" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
+
+check_describe "original/original_branch_A*" --all test-annotated~1
+
+test_expect_success '--match does not work for other types' '
+	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
+'
+
+test_expect_success '--exclude does not work for other types' '
+	R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
+	case "$R" in
+	*original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
+		false;;
+	*) echo ok: Found some known type;;
+	esac
+'
+
 test_expect_success 'name-rev with exact tags' '
 	echo A >expect &&
 	tag_object=$(git rev-parse refs/tags/A) &&
@@ -202,6 +229,31 @@ test_expect_success 'name-rev with exact tags' '
 	test_cmp expect actual
 '
 
+test_expect_success 'name-rev --all' '
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		git name-rev $rev >>expect.unsorted
+	done &&
+	sort <expect.unsorted >expect &&
+	git name-rev --all >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'name-rev --stdin' '
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		name=$(git name-rev --name-only $rev) &&
+		echo "$rev ($name)" >>expect.unsorted
+	done &&
+	sort <expect.unsorted >expect &&
+	git rev-list --all | git name-rev --stdin >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'describe --contains with the exact tags' '
 	echo "A^0" >expect &&
 	tag_object=$(git rev-parse refs/tags/A) &&
@@ -254,7 +306,38 @@ test_expect_success 'describe chokes on severely broken submodules' '
 '
 test_expect_success 'describe ignoring a borken submodule' '
 	git describe --broken >out &&
+	test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
 	grep broken out
 '
 
+test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
+	i=1 &&
+	while test $i -lt 8000
+	do
+		echo "commit refs/heads/master
+committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
+data <<EOF
+commit #$i
+EOF"
+		test $i = 1 && echo "from refs/heads/master^0"
+		i=$(($i + 1))
+	done | git fast-import &&
+	git checkout master &&
+	git tag far-far-away HEAD^ &&
+	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
+	git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' '
+	git tag -f far-far-away HEAD~7999 &&
+	echo "far-far-away" >expect &&
+	git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index d0ad90291..3aa534933 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -610,18 +610,104 @@ test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
 cat >trailers <<EOF
 Reviewed-by: A U Thor <author@example.com>
 Signed-off-by: A U Thor <author@example.com>
+[ v2 updated patch description ]
+Acked-by: A U Thor
+  <author@example.com>
 EOF
 
-test_expect_success 'basic atom: head contents:trailers' '
+unfold () {
+	perl -0pe 's/\n\s+/ /g'
+}
+
+test_expect_success 'set up trailers for next test' '
 	echo "Some contents" > two &&
 	git add two &&
-	git commit -F - <<-EOF &&
+	git commit -F - <<-EOF
 	trailers: this commit message has trailers
 
 	Some message contents
 
 	$(cat trailers)
 	EOF
+'
+
+test_expect_success '%(trailers:unfold) unfolds trailers' '
+	git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
+	{
+		unfold <trailers
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only) shows only "key: value" trailers' '
+	git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
+	git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
+	git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
+	git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
+	{
+		unfold <trailers
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' '
+	git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
+	git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
+	git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers) rejects unknown trailers arguments' '
+	# error message cannot be checked under i18n
+	cat >expect <<-EOF &&
+	fatal: unknown %(trailers) argument: unsupported
+	EOF
+	test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
+	test_i18ncmp expect actual
+'
+
+test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
+	# error message cannot be checked under i18n
+	cat >expect <<-EOF &&
+	fatal: unknown %(trailers) argument: unsupported
+	EOF
+	test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
+	test_i18ncmp expect actual
+'
+
+test_expect_success 'basic atom: head contents:trailers' '
 	git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
 	sanitize_pgp <actual >actual.clean &&
 	# git for-each-ref ends with a blank line
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index e365d1ff7..f5929c46f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -488,7 +488,32 @@ test_expect_success 'moving a submodule in nested directories' '
 		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
 		echo "directory/hierarchy/sub" >../expect
 	) &&
-	test_cmp actual expect
+	test_cmp expect actual
+'
+
+test_expect_failure 'moving nested submodules' '
+	git commit -am "cleanup commit" &&
+	mkdir sub_nested_nested &&
+	(cd sub_nested_nested &&
+		touch nested_level2 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 2"
+	) &&
+	mkdir sub_nested &&
+	(cd sub_nested &&
+		touch nested_level1 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 1"
+		git submodule add ../sub_nested_nested &&
+		git commit -m "add nested level 2"
+	) &&
+	git submodule add ./sub_nested nested_move &&
+	git commit -m "add nested_move" &&
+	git submodule update --init --recursive &&
+	git mv nested_move sub_nested_moved &&
+	git status
 '
 
 test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 62aa32284..a9af2de99 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1863,13 +1863,6 @@ test_expect_success 'version sort with very long prerelease suffix' '
 	git tag -l --sort=version:refname
 '
 
-run_with_limited_stack () {
-	(ulimit -s 128 && "$@")
-}
-
-test_lazy_prereq ULIMIT_STACK_SIZE 'run_with_limited_stack true'
-
-# we require ulimit, this excludes Windows
 test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a deep repo' '
 	>expect &&
 	i=1 &&
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 1b530b502..29e5043b9 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -38,7 +38,7 @@ test_expect_success setup '
 	test_commit "$msg" &&
 	echo "$msg" >expect &&
 	git show -s --format=%s > actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 
 '
 
@@ -85,7 +85,7 @@ do
 		git --exec-path=. commit --amend &&
 		git show -s --pretty=oneline |
 		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp actual expect
+		test_cmp expect actual
 	'
 done
 
@@ -107,7 +107,7 @@ do
 		git --exec-path=. commit --amend &&
 		git show -s --pretty=oneline |
 		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp actual expect
+		test_cmp expect actual
 	'
 done
 
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 86f23be34..95653a08c 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -428,9 +428,9 @@ test_expect_success 'test --mixed <paths>' '
 	git reset HEAD -- file1 file2 file3 &&
 	test_must_fail git diff --quiet &&
 	git diff > output &&
-	test_cmp output expect &&
+	test_cmp expect output &&
 	git diff --cached > output &&
-	test_cmp output cached_expect
+	test_cmp cached_expect output
 '
 
 test_expect_success 'test resetting the index at give paths' '
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index d4b217b0e..76c223c96 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -187,7 +187,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
 	d
 	>>>>>>> local
 	EOF
-	test_cmp two expect
+	test_cmp expect two
 '
 
 test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
@@ -213,7 +213,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
 	d
 	>>>>>>> local
 	EOF
-	test_cmp two expect
+	test_cmp expect two
 '
 
 test_expect_success 'switch to another branch while carrying a deletion' '
diff --git a/t/t7301-clean-interactive.sh b/t/t7301-clean-interactive.sh
index 3ae394e93..1bf9789c8 100755
--- a/t/t7301-clean-interactive.sh
+++ b/t/t7301-clean-interactive.sh
@@ -3,6 +3,7 @@
 test_description='git clean -i basic tests'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'setup' '
 
@@ -472,4 +473,14 @@ test_expect_success 'git clean -id with prefix and path (ask)' '
 
 '
 
+test_expect_success TTY 'git clean -i paints the header in HEADER color' '
+	>a.out &&
+	echo q |
+	test_terminal git clean -i |
+	test_decode_color |
+	head -n 1 >header &&
+	# not i18ngrep
+	grep "^<BOLD>" header
+'
+
 test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e9c3335b7..a39e69a3e 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -46,16 +46,6 @@ test_expect_success 'submodule update aborts on missing gitmodules url' '
 	test_must_fail git submodule init
 '
 
-test_expect_success 'configuration parsing' '
-	test_when_finished "rm -f .gitmodules" &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "s"]
-		path
-		ignore
-	EOF
-	test_must_fail git status
-'
-
 test_expect_success 'setup - repository in init subdirectory' '
 	mkdir init &&
 	(
@@ -1221,7 +1211,7 @@ test_expect_success 'clone --recurse-submodules with a pathspec works' '
 
 	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
 	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
-	test_cmp actual expected
+	test_cmp expected actual
 '
 
 test_expect_success 'clone with multiple --recurse-submodules options' '
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 0d5b42a25..7bfb2f498 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -119,7 +119,7 @@ test_expect_success 'merge with one side as a fast-forward of the other' '
 	 git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
 	 (cd sub &&
 	  git rev-parse sub-d > ../expect) &&
-	 test_cmp actual expect)
+	 test_cmp expect actual)
 '
 
 test_expect_success 'merging should conflict for non fast-forward' '
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 034914a14..6f083c4d6 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -406,6 +406,14 @@ test_expect_success 'submodule update - command in .git/config' '
 	)
 '
 
+test_expect_success 'submodule update - command in .gitmodules is ignored' '
+	test_when_finished "git -C super reset --hard HEAD^" &&
+	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
+	git -C super commit -a -m "add command to .gitmodules file" &&
+	git -C super/submodule reset --hard $submodulesha1^ &&
+	git -C super submodule update submodule
+'
+
 cat << EOF >expect
 Execution of 'false $submodulesha1' failed in submodule path 'submodule'
 EOF
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index eea36f1db..46c09c776 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -31,6 +31,21 @@ test_expect_success 'submodule config cache setup' '
 	)
 '
 
+test_expect_success 'configuration parsing with error' '
+	test_when_finished "rm -rf repo" &&
+	test_create_repo repo &&
+	cat >repo/.gitmodules <<-\EOF &&
+	[submodule "s"]
+		path
+		ignore
+	EOF
+	(
+		cd repo &&
+		test_must_fail test-submodule-config "" s 2>actual &&
+		test_i18ngrep "bad config" actual
+	)
+'
+
 cat >super/expect <<EOF
 Submodule name: 'a' for path 'a'
 Submodule name: 'a' for path 'b'
@@ -107,78 +122,6 @@ test_expect_success 'using different treeishs works' '
 	)
 '
 
-cat >super/expect_url <<EOF
-Submodule url: 'git@somewhere.else.net:a.git' for path 'b'
-Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule'
-EOF
-
-cat >super/expect_local_path <<EOF
-Submodule name: 'a' for path 'c'
-Submodule name: 'submodule' for path 'submodule'
-EOF
-
-test_expect_success 'reading of local configuration' '
-	(cd super &&
-		old_a=$(git config submodule.a.url) &&
-		old_submodule=$(git config submodule.submodule.url) &&
-		git config submodule.a.url git@somewhere.else.net:a.git &&
-		git config submodule.submodule.url git@somewhere.else.net:submodule.git &&
-		test-submodule-config --url \
-			"" b \
-			"" submodule \
-				>actual &&
-		test_cmp expect_url actual &&
-		git config submodule.a.path c &&
-		test-submodule-config \
-			"" c \
-			"" submodule \
-				>actual &&
-		test_cmp expect_local_path actual &&
-		git config submodule.a.url "$old_a" &&
-		git config submodule.submodule.url "$old_submodule" &&
-		git config --unset submodule.a.path c
-	)
-'
-
-cat >super/expect_url <<EOF
-Submodule url: '../submodule' for path 'b'
-Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule'
-EOF
-
-test_expect_success 'reading of local configuration for uninitialized submodules' '
-	(
-		cd super &&
-		git submodule deinit -f b &&
-		old_submodule=$(git config submodule.submodule.url) &&
-		git config submodule.submodule.url git@somewhere.else.net:submodule.git &&
-		test-submodule-config --url \
-			"" b \
-			"" submodule \
-				>actual &&
-		test_cmp expect_url actual &&
-		git config submodule.submodule.url "$old_submodule" &&
-		git submodule init b
-	)
-'
-
-cat >super/expect_fetchrecurse_die.err <<EOF
-fatal: bad submodule.submodule.fetchrecursesubmodules argument: blabla
-EOF
-
-test_expect_success 'local error in fetchrecursesubmodule dies early' '
-	(cd super &&
-		git config submodule.submodule.fetchrecursesubmodules blabla &&
-		test_must_fail test-submodule-config \
-			"" b \
-			"" submodule \
-				>actual.out 2>actual.err &&
-		touch expect_fetchrecurse_die.out &&
-		test_cmp expect_fetchrecurse_die.out actual.out  &&
-		test_cmp expect_fetchrecurse_die.err actual.err  &&
-		git config --unset submodule.submodule.fetchrecursesubmodules
-	)
-'
-
 test_expect_success 'error in history in fetchrecursesubmodule lets continue' '
 	(cd super &&
 		git config -f .gitmodules \
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda29..302a3a208 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@ cat > "$HOOK" <<EOF
 exit 1
 EOF
 
+commit_msg_is () {
+	test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
 test_expect_success 'with failing hook' '
 
 	echo "another" >> file &&
@@ -135,6 +139,32 @@ test_expect_success '--no-verify with failing hook (editor)' '
 
 '
 
+test_expect_success 'merge fails with failing hook' '
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	test_must_fail git merge --allow-unrelated-histories master &&
+	commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify --allow-unrelated-histories master &&
+	commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
 chmod -x "$HOOK"
 test_expect_success POSIXPERM 'with non-executable hook' '
 
@@ -178,10 +208,6 @@ exit 0
 EOF
 chmod +x "$HOOK"
 
-commit_msg_is () {
-	test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
 test_expect_success 'hook edits commit message' '
 
 	echo "additional" >> file &&
@@ -217,7 +243,36 @@ test_expect_success "hook doesn't edit commit message (editor)" '
 	echo "more plus" > FAKE_MSG &&
 	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
 	commit_msg_is "more plus"
+'
 
+test_expect_success 'hook called in git-merge picks up commit message' '
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --allow-unrelated-histories master &&
+	commit_msg_is "new message"
+'
+
+test_expect_failure 'merge --continue remembers --no-verify' '
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout master &&
+	echo a >file2 &&
+	git add file2 &&
+	git commit --no-verify -m "add file2 to master" &&
+	git checkout -b newbranch master^ &&
+	echo b >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify -m not-rewritten-by-hook master &&
+	# resolve conflict:
+	echo c >file2 &&
+	git add file2 &&
+	git merge --continue &&
+	commit_msg_is not-rewritten-by-hook
 '
 
 # set up fake editor to replace `pick` by `reword`
@@ -237,4 +292,5 @@ test_expect_success 'hook is called for reword during `rebase -i`' '
 
 '
 
+
 test_done
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 055c90736..9edf6572e 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -306,7 +306,7 @@ test_expect_success 'diff with merge conflict in .gitmodules' '
 		cd super &&
 		git diff >../diff_actual 2>&1
 	) &&
-	test_cmp diff_actual diff_expect
+	test_cmp diff_expect diff_actual
 '
 
 test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
@@ -314,7 +314,7 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
 		cd super &&
 		git diff --submodule >../diff_submodule_actual 2>&1
 	) &&
-	test_cmp diff_submodule_actual diff_submodule_expect
+	test_cmp diff_submodule_expect diff_submodule_actual
 '
 
 # We'll setup different cases for further testing:
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index a3d760e63..50052e287 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1671,4 +1671,14 @@ test_expect_success '"Initial commit" should not be noted in commit template' '
 	test_i18ngrep ! "Initial commit" output
 '
 
+test_expect_success '--no-optional-locks prevents index update' '
+	test-chmtime =1234567890 .git/index &&
+	git --no-optional-locks status &&
+	test-chmtime -v +0 .git/index >out &&
+	grep ^1234567890 out &&
+	git status &&
+	test-chmtime -v +0 .git/index >out &&
+	! grep ^1234567890 out
+'
+
 test_done
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 0c6f91c43..164719d1c 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -681,6 +681,36 @@ test_expect_success 'using "where = before"' '
 	test_cmp expected actual
 '
 
+test_expect_success 'overriding configuration with "--where after"' '
+	git config trailer.ack.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --where after --trailer "ack: Peff" \
+		complex_message >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'using "where = before" with "--no-where"' '
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Peff
+		Acked-by= Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --where after --no-where --trailer "ack: Peff" \
+		--trailer "bug: 42" complex_message >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'using "where = after"' '
 	git config trailer.ack.where "after" &&
 	cat complex_message_body >expected &&
@@ -947,6 +977,23 @@ test_expect_success 'using "ifExists = add" with "where = after"' '
 	test_cmp expected actual
 '
 
+test_expect_success 'overriding configuration with "--if-exists replace"' '
+	git config trailer.fix.key "Fixes: " &&
+	git config trailer.fix.ifExists "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Fixes: 22
+	EOF
+	git interpret-trailers --if-exists replace --trailer "review:" \
+		--trailer "fix=53" --trailer "fix=22" --trailer "bug: 42" \
+		<complex_message >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'using "ifExists = replace"' '
 	git config trailer.fix.key "Fixes: " &&
 	git config trailer.fix.ifExists "replace" &&
@@ -1026,6 +1073,25 @@ test_expect_success 'the default is "ifMissing = add"' '
 	test_cmp expected actual
 '
 
+test_expect_success 'overriding configuration with "--if-missing doNothing"' '
+	git config trailer.ifmissing "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --if-missing doNothing \
+		--trailer "review:" --trailer "fix=53" \
+		--trailer "cc=Linus" --trailer "ack: Junio" \
+		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'when default "ifMissing" is "doNothing"' '
 	git config trailer.ifmissing "doNothing" &&
 	cat complex_message_body >expected &&
@@ -1275,4 +1341,80 @@ test_expect_success 'with cut line' '
 	test_cmp expected actual
 '
 
+test_expect_success 'only trailers' '
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		existing: existing-value
+		sign: config-value
+		added: added-value
+	EOF
+	git interpret-trailers \
+		--trailer added:added-value \
+		--only-trailers >actual <<-\EOF &&
+		my subject
+
+		my body
+
+		existing: existing-value
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'only-trailers omits non-trailer in middle of block' '
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		Signed-off-by: nobody <nobody@nowhere>
+		Signed-off-by: somebody <somebody@somewhere>
+		sign: config-value
+	EOF
+	git interpret-trailers --only-trailers >actual <<-\EOF &&
+		subject
+
+		it is important that the trailers below are signed-off-by
+		so that they meet the "25% trailers Git knows about" heuristic
+
+		Signed-off-by: nobody <nobody@nowhere>
+		this is not a trailer
+		Signed-off-by: somebody <somebody@somewhere>
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'only input' '
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		existing: existing-value
+	EOF
+	git interpret-trailers \
+		--only-trailers --only-input >actual <<-\EOF &&
+		my subject
+
+		my body
+
+		existing: existing-value
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'unfold' '
+	cat >expected <<-\EOF &&
+		foo: continued across several lines
+	EOF
+	# pass through tr to make leading and trailing whitespace more obvious
+	tr _ " " <<-\EOF |
+		my subject
+
+		my body
+
+		foo:_
+		__continued
+		___across
+		____several
+		_____lines
+		___
+	EOF
+	git interpret-trailers --only-trailers --only-input --unfold >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 80194b79f..dfde6a675 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -697,7 +697,7 @@ test_expect_success 'merge --no-ff --edit' '
 	git cat-file commit HEAD >raw &&
 	grep "work done on the side branch" raw &&
 	sed "1,/^$/d" >actual raw &&
-	test_cmp actual expected
+	test_cmp expected actual
 '
 
 test_expect_success GPG 'merge --ff-only tag' '
@@ -709,7 +709,7 @@ test_expect_success GPG 'merge --ff-only tag' '
 	git merge --ff-only signed &&
 	git rev-parse signed^0 >expect &&
 	git rev-parse HEAD >actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 test_expect_success GPG 'merge --no-edit tag should skip editor' '
@@ -721,7 +721,7 @@ test_expect_success GPG 'merge --no-edit tag should skip editor' '
 	EDITOR=false git merge --no-edit signed &&
 	git rev-parse signed^0 >expect &&
 	git rev-parse HEAD^2 >actual &&
-	test_cmp actual expect
+	test_cmp expect actual
 '
 
 test_expect_success 'set up mod-256 conflict scenario' '
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 381b7df45..1a430b9c4 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -621,7 +621,7 @@ test_expect_success 'file with no base' '
 	test_must_fail git merge master &&
 	git mergetool --no-prompt --tool mybase -- both &&
 	>expected &&
-	test_cmp both expected
+	test_cmp expected both
 '
 
 test_expect_success 'custom commands override built-ins' '
@@ -632,7 +632,7 @@ test_expect_success 'custom commands override built-ins' '
 	test_must_fail git merge master &&
 	git mergetool --no-prompt --tool defaults -- both &&
 	echo master both added >expected &&
-	test_cmp both expected
+	test_cmp expected both
 '
 
 test_expect_success 'filenames seen by tools start with ./' '
diff --git a/t/t7614-merge-signoff.sh b/t/t7614-merge-signoff.sh
new file mode 100755
index 000000000..c1b8446f4
--- /dev/null
+++ b/t/t7614-merge-signoff.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='git merge --signoff
+
+This test runs git merge --signoff and makes sure that it works.
+'
+
+. ./test-lib.sh
+
+# Setup test files
+test_setup() {
+	# Expected commit message after merge --signoff
+	cat >expected-signed <<EOF &&
+Merge branch 'master' into other-branch
+
+Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
+EOF
+
+	# Expected commit message after merge without --signoff (or with --no-signoff)
+	cat >expected-unsigned <<EOF &&
+Merge branch 'master' into other-branch
+EOF
+
+	# Initial commit and feature branch to merge master into it.
+	git commit --allow-empty -m "Initial empty commit" &&
+	git checkout -b other-branch &&
+	test_commit other-branch file1 1
+}
+
+# Setup repository, files & feature branch
+# This step must be run if You want to test 2,3 or 4
+# Order of 2,3,4 is not important, but 1 must be run before
+# For example `-r 1,4` or `-r 1,4,2 -v` etc
+# But not `-r 2` or `-r 4,3,2,1`
+test_expect_success 'setup' '
+	test_setup
+'
+
+# Test with --signoff flag
+test_expect_success 'git merge --signoff adds a sign-off line' '
+	git checkout master &&
+	test_commit master-branch-2 file2 2 &&
+	git checkout other-branch &&
+	git merge master --signoff --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
+'
+
+# Test without --signoff flag
+test_expect_success 'git merge does not add a sign-off line' '
+	git checkout master &&
+	test_commit master-branch-3 file3 3 &&
+	git checkout other-branch &&
+	git merge master --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned actual
+'
+
+# Test for --no-signoff flag
+test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
+	git checkout master &&
+	test_commit master-branch-4 file4 4 &&
+	git checkout other-branch &&
+	git merge master --no-edit --signoff --no-signoff &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned actual
+'
+
+test_done
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index f30980895..4d261c2a9 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1266,7 +1266,7 @@ test_expect_success $PREREQ 'asks about and fixes 8bit encodings' '
 	grep email-using-8bit stdout &&
 	grep "Which 8bit encoding" stdout &&
 	egrep "Content|MIME" msgtxt1 >actual &&
-	test_cmp actual content-type-decl
+	test_cmp content-type-decl actual
 '
 
 test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
@@ -1277,7 +1277,7 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
 			--smtp-server="$(pwd)/fake.sendmail" \
 			email-using-8bit >stdout &&
 	egrep "Content|MIME" msgtxt1 >actual &&
-	test_cmp actual content-type-decl
+	test_cmp content-type-decl actual
 '
 
 test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
@@ -1289,7 +1289,7 @@ test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
 			--8bit-encoding=UTF-8 \
 			email-using-8bit >stdout &&
 	egrep "Content|MIME" msgtxt1 >actual &&
-	test_cmp actual content-type-decl
+	test_cmp content-type-decl actual
 '
 
 test_expect_success $PREREQ 'setup expect' '
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 6dafe7e99..8eaaca6f9 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -4,12 +4,13 @@ test_description='check svn dumpfile importer'
 
 . ./test-lib.sh
 
+if test_have_prereq !PIPE
+then
+	skip_all="svn dumpfile importer testing requires the PIPE prerequisite"
+	test_done
+fi
+
 reinit_git () {
-	if ! test_declared_prereq PIPE
-	then
-		echo >&4 "reinit_git: need to declare PIPE prerequisite"
-		return 127
-	fi
 	rm -fr .git &&
 	rm -f stream backflow &&
 	git init &&
@@ -54,19 +55,19 @@ text_no_props () {
 
 >empty
 
-test_expect_success PIPE 'empty dump' '
+test_expect_success 'empty dump' '
 	reinit_git &&
 	echo "SVN-fs-dump-format-version: 2" >input &&
 	try_dump input
 '
 
-test_expect_success PIPE 'v4 dumps not supported' '
+test_expect_success 'v4 dumps not supported' '
 	reinit_git &&
 	echo "SVN-fs-dump-format-version: 4" >v4.dump &&
 	try_dump v4.dump must_fail
 '
 
-test_expect_failure PIPE 'empty revision' '
+test_expect_failure 'empty revision' '
 	reinit_git &&
 	printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
 	cat >emptyrev.dump <<-\EOF &&
@@ -86,7 +87,7 @@ test_expect_failure PIPE 'empty revision' '
 	test_cmp expect actual
 '
 
-test_expect_success PIPE 'empty properties' '
+test_expect_success 'empty properties' '
 	reinit_git &&
 	printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
 	cat >emptyprop.dump <<-\EOF &&
@@ -109,7 +110,7 @@ test_expect_success PIPE 'empty properties' '
 	test_cmp expect actual
 '
 
-test_expect_success PIPE 'author name and commit message' '
+test_expect_success 'author name and commit message' '
 	reinit_git &&
 	echo "<author@example.com, author@example.com@local>" >expect.author &&
 	cat >message <<-\EOF &&
@@ -143,7 +144,7 @@ test_expect_success PIPE 'author name and commit message' '
 	test_cmp expect.author actual.author
 '
 
-test_expect_success PIPE 'unsupported properties are ignored' '
+test_expect_success 'unsupported properties are ignored' '
 	reinit_git &&
 	echo author >expect &&
 	cat >extraprop.dump <<-\EOF &&
@@ -168,7 +169,7 @@ test_expect_success PIPE 'unsupported properties are ignored' '
 	test_cmp expect actual
 '
 
-test_expect_failure PIPE 'timestamp and empty file' '
+test_expect_failure 'timestamp and empty file' '
 	echo author@example.com >expect.author &&
 	echo 1999-01-01 >expect.date &&
 	echo file >expect.files &&
@@ -210,7 +211,7 @@ test_expect_failure PIPE 'timestamp and empty file' '
 	test_cmp empty file
 '
 
-test_expect_success PIPE 'directory with files' '
+test_expect_success 'directory with files' '
 	reinit_git &&
 	printf "%s\n" directory/file1 directory/file2 >expect.files &&
 	echo hi >hi &&
@@ -263,7 +264,7 @@ test_expect_success PIPE 'directory with files' '
 	test_cmp hi directory/file2
 '
 
-test_expect_success PIPE 'branch name with backslash' '
+test_expect_success 'branch name with backslash' '
 	reinit_git &&
 	sort <<-\EOF >expect.branch-files &&
 	trunk/file1
@@ -362,7 +363,7 @@ test_expect_success PIPE 'branch name with backslash' '
 	test_cmp expect.branch-files actual.branch-files
 '
 
-test_expect_success PIPE 'node without action' '
+test_expect_success 'node without action' '
 	reinit_git &&
 	cat >inaction.dump <<-\EOF &&
 	SVN-fs-dump-format-version: 3
@@ -383,7 +384,7 @@ test_expect_success PIPE 'node without action' '
 	try_dump inaction.dump must_fail
 '
 
-test_expect_success PIPE 'action: add node without text' '
+test_expect_success 'action: add node without text' '
 	reinit_git &&
 	cat >textless.dump <<-\EOF &&
 	SVN-fs-dump-format-version: 3
@@ -405,7 +406,7 @@ test_expect_success PIPE 'action: add node without text' '
 	try_dump textless.dump must_fail
 '
 
-test_expect_failure PIPE 'change file mode but keep old content' '
+test_expect_failure 'change file mode but keep old content' '
 	reinit_git &&
 	cat >expect <<-\EOF &&
 	OBJID
@@ -481,7 +482,7 @@ test_expect_failure PIPE 'change file mode but keep old content' '
 	test_cmp hello actual.target
 '
 
-test_expect_success PIPE 'NUL in property value' '
+test_expect_success 'NUL in property value' '
 	reinit_git &&
 	echo "commit message" >expect.message &&
 	{
@@ -507,7 +508,7 @@ test_expect_success PIPE 'NUL in property value' '
 	test_cmp expect.message actual.message
 '
 
-test_expect_success PIPE 'NUL in log message, file content, and property name' '
+test_expect_success 'NUL in log message, file content, and property name' '
 	# Caveat: svnadmin 1.6.16 (r1073529) truncates at \0 in the
 	# svn:specialQnotreally example.
 	reinit_git &&
@@ -587,7 +588,7 @@ test_expect_success PIPE 'NUL in log message, file content, and property name' '
 	test_cmp expect.hello2 actual.hello2
 '
 
-test_expect_success PIPE 'change file mode and reiterate content' '
+test_expect_success 'change file mode and reiterate content' '
 	reinit_git &&
 	cat >expect <<-\EOF &&
 	OBJID
@@ -667,7 +668,7 @@ test_expect_success PIPE 'change file mode and reiterate content' '
 	test_cmp hello actual.target
 '
 
-test_expect_success PIPE 'deltas supported' '
+test_expect_success 'deltas supported' '
 	reinit_git &&
 	{
 		# (old) h + (inline) ello + (old) \n
@@ -731,7 +732,7 @@ test_expect_success PIPE 'deltas supported' '
 	try_dump delta.dump
 '
 
-test_expect_success PIPE 'property deltas supported' '
+test_expect_success 'property deltas supported' '
 	reinit_git &&
 	cat >expect <<-\EOF &&
 	OBJID
@@ -796,7 +797,7 @@ test_expect_success PIPE 'property deltas supported' '
 	test_cmp expect actual
 '
 
-test_expect_success PIPE 'properties on /' '
+test_expect_success 'properties on /' '
 	reinit_git &&
 	cat <<-\EOF >expect &&
 	OBJID
@@ -850,7 +851,7 @@ test_expect_success PIPE 'properties on /' '
 	test_cmp expect actual
 '
 
-test_expect_success PIPE 'deltas for typechange' '
+test_expect_success 'deltas for typechange' '
 	reinit_git &&
 	cat >expect <<-\EOF &&
 	OBJID
@@ -935,7 +936,7 @@ test_expect_success PIPE 'deltas for typechange' '
 	test_cmp expect actual
 '
 
-test_expect_success PIPE 'deltas need not consume the whole preimage' '
+test_expect_success 'deltas need not consume the whole preimage' '
 	reinit_git &&
 	cat >expect <<-\EOF &&
 	OBJID
@@ -1040,7 +1041,7 @@ test_expect_success PIPE 'deltas need not consume the whole preimage' '
 	test_cmp expect.3 actual.3
 '
 
-test_expect_success PIPE 'no hang for delta trying to read past end of preimage' '
+test_expect_success 'no hang for delta trying to read past end of preimage' '
 	reinit_git &&
 	{
 		# COPY 1
@@ -1087,7 +1088,7 @@ test_expect_success 'set up svn repo' '
 	fi
 '
 
-test_expect_success SVNREPO,PIPE 't9135/svn.dump' '
+test_expect_success SVNREPO 't9135/svn.dump' '
 	mkdir -p simple-git &&
 	(
 		cd simple-git &&
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 67b8c50a5..d47560b63 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -3120,4 +3120,146 @@ test_expect_success 'U: validate root delete result' '
 	compare_diff_raw expect actual
 '
 
+###
+### series V (checkpoint)
+###
+
+# The commands in input_file should not produce any output on the file
+# descriptor set with --cat-blob-fd (or stdout if unspecified).
+#
+# To make sure you're observing the side effects of checkpoint *before*
+# fast-import terminates (and thus writes out its state), check that the
+# fast-import process is still running using background_import_still_running
+# *after* evaluating the test conditions.
+background_import_then_checkpoint () {
+	options=$1
+	input_file=$2
+
+	mkfifo V.input
+	exec 8<>V.input
+	rm V.input
+
+	mkfifo V.output
+	exec 9<>V.output
+	rm V.output
+
+	git fast-import $options <&8 >&9 &
+	echo $! >V.pid
+	# We don't mind if fast-import has already died by the time the test
+	# ends.
+	test_when_finished "exec 8>&-; exec 9>&-; kill $(cat V.pid) || true"
+
+	# Start in the background to ensure we adhere strictly to (blocking)
+	# pipes writing sequence. We want to assume that the write below could
+	# block, e.g. if fast-import blocks writing its own output to &9
+	# because there is no reader on &9 yet.
+	(
+		cat "$input_file"
+		echo "checkpoint"
+		echo "progress checkpoint"
+	) >&8 &
+
+	error=1 ;# assume the worst
+	while read output <&9
+	do
+		if test "$output" = "progress checkpoint"
+		then
+			error=0
+			break
+		fi
+		# otherwise ignore cruft
+		echo >&2 "cruft: $output"
+	done
+
+	if test $error -eq 1
+	then
+		false
+	fi
+}
+
+background_import_still_running () {
+	if ! kill -0 "$(cat V.pid)"
+	then
+		echo >&2 "background fast-import terminated too early"
+		false
+	fi
+}
+
+test_expect_success PIPE 'V: checkpoint helper does not get stuck with extra output' '
+	cat >input <<-INPUT_END &&
+	progress foo
+	progress bar
+
+	INPUT_END
+
+	background_import_then_checkpoint "" input &&
+	background_import_still_running
+'
+
+test_expect_success PIPE 'V: checkpoint updates refs after reset' '
+	cat >input <<-\INPUT_END &&
+	reset refs/heads/V
+	from refs/heads/U
+
+	INPUT_END
+
+	background_import_then_checkpoint "" input &&
+	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
+	background_import_still_running
+'
+
+test_expect_success PIPE 'V: checkpoint updates refs and marks after commit' '
+	cat >input <<-INPUT_END &&
+	commit refs/heads/V
+	mark :1
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
+	from refs/heads/U
+
+	INPUT_END
+
+	background_import_then_checkpoint "--export-marks=marks.actual" input &&
+
+	echo ":1 $(git rev-parse --verify V)" >marks.expected &&
+
+	test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify U)" &&
+	test_cmp marks.expected marks.actual &&
+	background_import_still_running
+'
+
+# Re-create the exact same commit, but on a different branch: no new object is
+# created in the database, but the refs and marks still need to be updated.
+test_expect_success PIPE 'V: checkpoint updates refs and marks after commit (no new objects)' '
+	cat >input <<-INPUT_END &&
+	commit refs/heads/V2
+	mark :2
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
+	from refs/heads/U
+
+	INPUT_END
+
+	background_import_then_checkpoint "--export-marks=marks.actual" input &&
+
+	echo ":2 $(git rev-parse --verify V2)" >marks.expected &&
+
+	test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" &&
+	test_cmp marks.expected marks.actual &&
+	background_import_still_running
+'
+
+test_expect_success PIPE 'V: checkpoint updates tags after tag' '
+	cat >input <<-INPUT_END &&
+	tag Vtag
+	from refs/heads/V
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
+
+	INPUT_END
+
+	background_import_then_checkpoint "" input &&
+	git show-ref -d Vtag &&
+	background_import_still_running
+'
+
 test_done
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 8dcb05c4a..866ddf605 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -234,7 +234,7 @@ test_expect_success 'fast-export -C -C | fast-import' '
 	mkdir new &&
 	git --git-dir=new/.git init &&
 	git fast-export -C -C --signed-tags=strip --all > output &&
-	grep "^C file6 file7\$" output &&
+	grep "^C file2 file4\$" output &&
 	cat output |
 	(cd new &&
 	 git fast-import &&
@@ -522,4 +522,22 @@ test_expect_success 'delete refspec' '
 	test_cmp expected actual
 '
 
+test_expect_success 'when using -C, do not declare copy when source of copy is also modified' '
+	test_create_repo src &&
+	echo a_line >src/file.txt &&
+	git -C src add file.txt &&
+	git -C src commit -m 1st_commit &&
+
+	cp src/file.txt src/file2.txt &&
+	echo another_line >>src/file.txt &&
+	git -C src add file.txt file2.txt &&
+	git -C src commit -m 2nd_commit &&
+
+	test_create_repo dst &&
+	git -C src fast-export --all -C | git -C dst fast-import &&
+	git -C src show >expected &&
+	git -C dst show >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 5fbd8d4a9..9b61f16f7 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -44,6 +44,11 @@ GIT_BUILD_DIR="$TEST_DIRECTORY"/..
 : ${ASAN_OPTIONS=detect_leaks=0:abort_on_error=1}
 export ASAN_OPTIONS
 
+# If LSAN is in effect we _do_ want leak checking, but we still
+# want to abort so that we notice the problems.
+: ${LSAN_OPTIONS=abort_on_error=1}
+export LSAN_OPTIONS
+
 ################################################################
 # It appears that people try to run tests without building...
 "$GIT_BUILD_DIR/git" >/dev/null
@@ -274,7 +279,7 @@ then
 	test -z "$verbose" && verbose_only="$valgrind_only"
 elif test -n "$valgrind"
 then
-	verbose=t
+	test -z "$verbose_log" && verbose=t
 fi
 
 if test -n "$color"
@@ -1062,14 +1067,8 @@ test_i18ngrep () {
 
 test_lazy_prereq PIPE '
 	# test whether the filesystem supports FIFOs
-	case $(uname -s) in
-	CYGWIN*|MINGW*)
-		false
-		;;
-	*)
-		rm -f testfifo && mkfifo testfifo
-		;;
-	esac
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
 '
 
 test_lazy_prereq SYMLINKS '
@@ -1165,7 +1164,19 @@ run_with_limited_cmdline () {
 	(ulimit -s 128 && "$@")
 }
 
-test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+test_lazy_prereq CMDLINE_LIMIT '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_cmdline true
+'
+
+run_with_limited_stack () {
+	(ulimit -s 128 && "$@")
+}
+
+test_lazy_prereq ULIMIT_STACK_SIZE '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_stack true
+'
 
 build_option () {
 	git version --build-options |
diff --git a/tag.c b/tag.c
index a3ffffdbf..fcbe012f7 100644
--- a/tag.c
+++ b/tag.c
@@ -33,7 +33,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
 	return ret;
 }
 
-int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
+int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
 		unsigned flags)
 {
 	enum object_type type;
@@ -41,20 +41,20 @@ int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
 	unsigned long size;
 	int ret;
 
-	type = sha1_object_info(sha1, NULL);
+	type = sha1_object_info(oid->hash, 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(sha1, DEFAULT_ABBREV),
+				find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
 				typename(type));
 
-	buf = read_sha1_file(sha1, &type, &size);
+	buf = read_sha1_file(oid->hash, &type, &size);
 	if (!buf)
 		return error("%s: unable to read file.",
 				name_to_report ?
 				name_to_report :
-				find_unique_abbrev(sha1, DEFAULT_ABBREV));
+				find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
 
 	ret = run_gpg_verify(buf, size, flags);
 
diff --git a/tag.h b/tag.h
index fdfcb4a84..d469534e8 100644
--- a/tag.h
+++ b/tag.h
@@ -17,7 +17,7 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si
 extern int parse_tag(struct tag *item);
 extern struct object *deref_tag(struct object *, const char *, int);
 extern struct object *deref_tag_noverify(struct object *);
-extern int gpg_verify_tag(const unsigned char *sha1,
+extern int gpg_verify_tag(const struct object_id *oid,
 		const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */
diff --git a/tempfile.c b/tempfile.c
index 684371067..5fdafdd2d 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -30,21 +30,19 @@
  *     `fdopen_tempfile()` has been called on the object
  *   - `owner` holds the PID of the process that created the file
  *
- * - Active, file closed (after successful `close_tempfile()`). Same
+ * - Active, file closed (after `close_tempfile_gently()`). Same
  *   as the previous state, except that the temporary file is closed,
  *   `fd` is -1, and `fp` is `NULL`.
  *
- * - Inactive (after `delete_tempfile()`, `rename_tempfile()`, a
- *   failed attempt to create a temporary file, or a failed
- *   `close_tempfile()`). In this state:
+ * - Inactive (after `delete_tempfile()`, `rename_tempfile()`, or a
+ *   failed attempt to create a temporary file). In this state:
  *
  *   - `active` is unset
  *   - `filename` is empty (usually, though there are transitory
  *     states in which this condition doesn't hold). Client code should
  *     *not* rely on the filename being empty in this state.
  *   - `fd` is -1 and `fp` is `NULL`
- *   - the object is left registered in the `tempfile_list`, and
- *     `on_list` is set.
+ *   - the object is removed from `tempfile_list` (but could be used again)
  *
  * A temporary file is owned by the process that created it. The
  * `tempfile` has an `owner` field that records the owner's PID. This
@@ -56,20 +54,28 @@
 #include "tempfile.h"
 #include "sigchain.h"
 
-static struct tempfile *volatile tempfile_list;
+static VOLATILE_LIST_HEAD(tempfile_list);
 
-static void remove_tempfiles(int skip_fclose)
+static void remove_tempfiles(int in_signal_handler)
 {
 	pid_t me = getpid();
+	volatile struct volatile_list_head *pos;
 
-	while (tempfile_list) {
-		if (tempfile_list->owner == me) {
-			/* fclose() is not safe to call in a signal handler */
-			if (skip_fclose)
-				tempfile_list->fp = NULL;
-			delete_tempfile(tempfile_list);
-		}
-		tempfile_list = tempfile_list->next;
+	list_for_each(pos, &tempfile_list) {
+		struct tempfile *p = list_entry(pos, struct tempfile, list);
+
+		if (!is_tempfile_active(p) || p->owner != me)
+			continue;
+
+		if (p->fd >= 0)
+			close(p->fd);
+
+		if (in_signal_handler)
+			unlink(p->filename.buf);
+		else
+			unlink_or_warn(p->filename.buf);
+
+		p->active = 0;
 	}
 }
 
@@ -85,39 +91,48 @@ static void remove_tempfiles_on_signal(int signo)
 	raise(signo);
 }
 
-/*
- * Initialize *tempfile if necessary and add it to tempfile_list.
- */
-static void prepare_tempfile_object(struct tempfile *tempfile)
+static struct tempfile *new_tempfile(void)
 {
-	if (!tempfile_list) {
-		/* One-time initialization */
+	struct tempfile *tempfile = xmalloc(sizeof(*tempfile));
+	tempfile->fd = -1;
+	tempfile->fp = NULL;
+	tempfile->active = 0;
+	tempfile->owner = 0;
+	INIT_LIST_HEAD(&tempfile->list);
+	strbuf_init(&tempfile->filename, 0);
+	return tempfile;
+}
+
+static void activate_tempfile(struct tempfile *tempfile)
+{
+	static int initialized;
+
+	if (is_tempfile_active(tempfile))
+		BUG("activate_tempfile called for active object");
+
+	if (!initialized) {
 		sigchain_push_common(remove_tempfiles_on_signal);
 		atexit(remove_tempfiles_on_exit);
+		initialized = 1;
 	}
 
-	if (tempfile->active)
-		die("BUG: prepare_tempfile_object called for active object");
-	if (!tempfile->on_list) {
-		/* Initialize *tempfile and add it to tempfile_list: */
-		tempfile->fd = -1;
-		tempfile->fp = NULL;
-		tempfile->active = 0;
-		tempfile->owner = 0;
-		strbuf_init(&tempfile->filename, 0);
-		tempfile->next = tempfile_list;
-		tempfile_list = tempfile;
-		tempfile->on_list = 1;
-	} else if (tempfile->filename.len) {
-		/* This shouldn't happen, but better safe than sorry. */
-		die("BUG: prepare_tempfile_object called for improperly-reset object");
-	}
+	volatile_list_add(&tempfile->list, &tempfile_list);
+	tempfile->owner = getpid();
+	tempfile->active = 1;
+}
+
+static void deactivate_tempfile(struct tempfile *tempfile)
+{
+	tempfile->active = 0;
+	strbuf_release(&tempfile->filename);
+	volatile_list_del(&tempfile->list);
+	free(tempfile);
 }
 
 /* Make sure errno contains a meaningful value on error */
-int create_tempfile(struct tempfile *tempfile, const char *path)
+struct tempfile *create_tempfile(const char *path)
 {
-	prepare_tempfile_object(tempfile);
+	struct tempfile *tempfile = new_tempfile();
 
 	strbuf_add_absolute_path(&tempfile->filename, path);
 	tempfile->fd = open(tempfile->filename.buf,
@@ -127,52 +142,48 @@ int create_tempfile(struct tempfile *tempfile, const char *path)
 		tempfile->fd = open(tempfile->filename.buf,
 				    O_RDWR | O_CREAT | O_EXCL, 0666);
 	if (tempfile->fd < 0) {
-		strbuf_reset(&tempfile->filename);
-		return -1;
+		deactivate_tempfile(tempfile);
+		return NULL;
 	}
-	tempfile->owner = getpid();
-	tempfile->active = 1;
+	activate_tempfile(tempfile);
 	if (adjust_shared_perm(tempfile->filename.buf)) {
 		int save_errno = errno;
 		error("cannot fix permission bits on %s", tempfile->filename.buf);
-		delete_tempfile(tempfile);
+		delete_tempfile(&tempfile);
 		errno = save_errno;
-		return -1;
+		return NULL;
 	}
-	return tempfile->fd;
+
+	return tempfile;
 }
 
-void register_tempfile(struct tempfile *tempfile, const char *path)
+struct tempfile *register_tempfile(const char *path)
 {
-	prepare_tempfile_object(tempfile);
+	struct tempfile *tempfile = new_tempfile();
 	strbuf_add_absolute_path(&tempfile->filename, path);
-	tempfile->owner = getpid();
-	tempfile->active = 1;
+	activate_tempfile(tempfile);
+	return tempfile;
 }
 
-int mks_tempfile_sm(struct tempfile *tempfile,
-		    const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_sm(const char *template, int suffixlen, int mode)
 {
-	prepare_tempfile_object(tempfile);
+	struct tempfile *tempfile = new_tempfile();
 
 	strbuf_add_absolute_path(&tempfile->filename, template);
 	tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
 	if (tempfile->fd < 0) {
-		strbuf_reset(&tempfile->filename);
-		return -1;
+		deactivate_tempfile(tempfile);
+		return NULL;
 	}
-	tempfile->owner = getpid();
-	tempfile->active = 1;
-	return tempfile->fd;
+	activate_tempfile(tempfile);
+	return tempfile;
 }
 
-int mks_tempfile_tsm(struct tempfile *tempfile,
-		     const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_tsm(const char *template, int suffixlen, int mode)
 {
+	struct tempfile *tempfile = new_tempfile();
 	const char *tmpdir;
 
-	prepare_tempfile_object(tempfile);
-
 	tmpdir = getenv("TMPDIR");
 	if (!tmpdir)
 		tmpdir = "/tmp";
@@ -180,35 +191,34 @@ int mks_tempfile_tsm(struct tempfile *tempfile,
 	strbuf_addf(&tempfile->filename, "%s/%s", tmpdir, template);
 	tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
 	if (tempfile->fd < 0) {
-		strbuf_reset(&tempfile->filename);
-		return -1;
+		deactivate_tempfile(tempfile);
+		return NULL;
 	}
-	tempfile->owner = getpid();
-	tempfile->active = 1;
-	return tempfile->fd;
+	activate_tempfile(tempfile);
+	return tempfile;
 }
 
-int xmks_tempfile_m(struct tempfile *tempfile, const char *template, int mode)
+struct tempfile *xmks_tempfile_m(const char *template, int mode)
 {
-	int fd;
+	struct tempfile *tempfile;
 	struct strbuf full_template = STRBUF_INIT;
 
 	strbuf_add_absolute_path(&full_template, template);
-	fd = mks_tempfile_m(tempfile, full_template.buf, mode);
-	if (fd < 0)
+	tempfile = mks_tempfile_m(full_template.buf, mode);
+	if (!tempfile)
 		die_errno("Unable to create temporary file '%s'",
 			  full_template.buf);
 
 	strbuf_release(&full_template);
-	return fd;
+	return tempfile;
 }
 
 FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
 {
-	if (!tempfile->active)
-		die("BUG: fdopen_tempfile() called for inactive object");
+	if (!is_tempfile_active(tempfile))
+		BUG("fdopen_tempfile() called for inactive object");
 	if (tempfile->fp)
-		die("BUG: fdopen_tempfile() called for open object");
+		BUG("fdopen_tempfile() called for open object");
 
 	tempfile->fp = fdopen(tempfile->fd, mode);
 	return tempfile->fp;
@@ -216,34 +226,36 @@ FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
 
 const char *get_tempfile_path(struct tempfile *tempfile)
 {
-	if (!tempfile->active)
-		die("BUG: get_tempfile_path() called for inactive object");
+	if (!is_tempfile_active(tempfile))
+		BUG("get_tempfile_path() called for inactive object");
 	return tempfile->filename.buf;
 }
 
 int get_tempfile_fd(struct tempfile *tempfile)
 {
-	if (!tempfile->active)
-		die("BUG: get_tempfile_fd() called for inactive object");
+	if (!is_tempfile_active(tempfile))
+		BUG("get_tempfile_fd() called for inactive object");
 	return tempfile->fd;
 }
 
 FILE *get_tempfile_fp(struct tempfile *tempfile)
 {
-	if (!tempfile->active)
-		die("BUG: get_tempfile_fp() called for inactive object");
+	if (!is_tempfile_active(tempfile))
+		BUG("get_tempfile_fp() called for inactive object");
 	return tempfile->fp;
 }
 
-int close_tempfile(struct tempfile *tempfile)
+int close_tempfile_gently(struct tempfile *tempfile)
 {
-	int fd = tempfile->fd;
-	FILE *fp = tempfile->fp;
+	int fd;
+	FILE *fp;
 	int err;
 
-	if (fd < 0)
+	if (!is_tempfile_active(tempfile) || tempfile->fd < 0)
 		return 0;
 
+	fd = tempfile->fd;
+	fp = tempfile->fp;
 	tempfile->fd = -1;
 	if (fp) {
 		tempfile->fp = NULL;
@@ -258,54 +270,52 @@ int close_tempfile(struct tempfile *tempfile)
 		err = close(fd);
 	}
 
-	if (err) {
-		int save_errno = errno;
-		delete_tempfile(tempfile);
-		errno = save_errno;
-		return -1;
-	}
-
-	return 0;
+	return err ? -1 : 0;
 }
 
 int reopen_tempfile(struct tempfile *tempfile)
 {
+	if (!is_tempfile_active(tempfile))
+		BUG("reopen_tempfile called for an inactive object");
 	if (0 <= tempfile->fd)
-		die("BUG: reopen_tempfile called for an open object");
-	if (!tempfile->active)
-		die("BUG: reopen_tempfile called for an inactive object");
+		BUG("reopen_tempfile called for an open object");
 	tempfile->fd = open(tempfile->filename.buf, O_WRONLY);
 	return tempfile->fd;
 }
 
-int rename_tempfile(struct tempfile *tempfile, const char *path)
+int rename_tempfile(struct tempfile **tempfile_p, const char *path)
 {
-	if (!tempfile->active)
-		die("BUG: rename_tempfile called for inactive object");
+	struct tempfile *tempfile = *tempfile_p;
+
+	if (!is_tempfile_active(tempfile))
+		BUG("rename_tempfile called for inactive object");
 
-	if (close_tempfile(tempfile))
+	if (close_tempfile_gently(tempfile)) {
+		delete_tempfile(tempfile_p);
 		return -1;
+	}
 
 	if (rename(tempfile->filename.buf, path)) {
 		int save_errno = errno;
-		delete_tempfile(tempfile);
+		delete_tempfile(tempfile_p);
 		errno = save_errno;
 		return -1;
 	}
 
-	tempfile->active = 0;
-	strbuf_reset(&tempfile->filename);
+	deactivate_tempfile(tempfile);
+	*tempfile_p = NULL;
 	return 0;
 }
 
-void delete_tempfile(struct tempfile *tempfile)
+void delete_tempfile(struct tempfile **tempfile_p)
 {
-	if (!tempfile->active)
+	struct tempfile *tempfile = *tempfile_p;
+
+	if (!is_tempfile_active(tempfile))
 		return;
 
-	if (!close_tempfile(tempfile)) {
-		unlink_or_warn(tempfile->filename.buf);
-		tempfile->active = 0;
-		strbuf_reset(&tempfile->filename);
-	}
+	close_tempfile_gently(tempfile);
+	unlink_or_warn(tempfile->filename.buf);
+	deactivate_tempfile(tempfile);
+	*tempfile_p = NULL;
 }
diff --git a/tempfile.h b/tempfile.h
index 2f0038dec..b8f4b5e14 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -1,6 +1,8 @@
 #ifndef TEMPFILE_H
 #define TEMPFILE_H
 
+#include "list.h"
+
 /*
  * Handle temporary files.
  *
@@ -15,25 +17,18 @@
  *
  * The caller:
  *
- * * Allocates a `struct tempfile` either as a static variable or on
- *   the heap, initialized to zeros. Once you use the structure to
- *   call `create_tempfile()`, it belongs to the tempfile subsystem
- *   and its storage must remain valid throughout the life of the
- *   program (i.e. you cannot use an on-stack variable to hold this
- *   structure).
- *
  * * Attempts to create a temporary file by calling
- *   `create_tempfile()`.
+ *   `create_tempfile()`. The resources used for the temporary file are
+ *   managed by the tempfile API.
  *
  * * Writes new content to the file by either:
  *
- *   * writing to the file descriptor returned by `create_tempfile()`
- *     (also available via `tempfile->fd`).
+ *   * writing to the `tempfile->fd` file descriptor
  *
  *   * calling `fdopen_tempfile()` to get a `FILE` pointer for the
  *     open file and writing to the file using stdio.
  *
- *   Note that the file descriptor returned by create_tempfile()
+ *   Note that the file descriptor created by create_tempfile()
  *   is marked O_CLOEXEC, so the new contents must be written by
  *   the current process, not any spawned one.
  *
@@ -47,19 +42,18 @@
  *   control of the file.
  *
  * * Close the file descriptor without removing or renaming the
- *   temporary file by calling `close_tempfile()`, and later call
+ *   temporary file by calling `close_tempfile_gently()`, and later call
  *   `delete_tempfile()` or `rename_tempfile()`.
  *
- * Even after the temporary file is renamed or deleted, the `tempfile`
- * object must not be freed or altered by the caller. However, it may
- * be reused; just pass it to another call of `create_tempfile()`.
+ * After the temporary file is renamed or deleted, the `tempfile`
+ * object is no longer valid and should not be reused.
  *
  * If the program exits before `rename_tempfile()` or
  * `delete_tempfile()` is called, an `atexit(3)` handler will close
  * and remove the temporary file.
  *
  * If you need to close the file descriptor yourself, do so by calling
- * `close_tempfile()`. You should never call `close(2)` or `fclose(3)`
+ * `close_tempfile_gently()`. You should never call `close(2)` or `fclose(3)`
  * yourself, otherwise the `struct tempfile` structure would still
  * think that the file descriptor needs to be closed, and a later
  * cleanup would result in duplicate calls to `close(2)`. Worse yet,
@@ -71,30 +65,30 @@
  * Error handling
  * --------------
  *
- * `create_tempfile()` returns a file descriptor on success or -1 on
- * failure. On errors, `errno` describes the reason for failure.
+ * `create_tempfile()` returns an allocated tempfile on success or NULL
+ * on failure. On errors, `errno` describes the reason for failure.
  *
- * `delete_tempfile()`, `rename_tempfile()`, and `close_tempfile()`
- * return 0 on success. On failure they set `errno` appropriately, do
- * their best to delete the temporary file, and return -1.
+ * `delete_tempfile()`, `rename_tempfile()`, and `close_tempfile_gently()`
+ * return 0 on success. On failure they set `errno` appropriately and return
+ * -1. `delete` and `rename` (but not `close`) do their best to delete the
+ * temporary file before returning.
  */
 
 struct tempfile {
-	struct tempfile *volatile next;
+	volatile struct volatile_list_head list;
 	volatile sig_atomic_t active;
 	volatile int fd;
 	FILE *volatile fp;
 	volatile pid_t owner;
-	char on_list;
 	struct strbuf filename;
 };
 
 /*
  * Attempt to create a temporary file at the specified `path`. Return
- * a file descriptor for writing to it, or -1 on error. It is an error
- * if a file already exists at that path.
+ * a tempfile (whose "fd" member can be used for writing to it), or
+ * NULL on error. It is an error if a file already exists at that path.
  */
-extern int create_tempfile(struct tempfile *tempfile, const char *path);
+extern struct tempfile *create_tempfile(const char *path);
 
 /*
  * Register an existing file as a tempfile, meaning that it will be
@@ -102,7 +96,7 @@ extern int create_tempfile(struct tempfile *tempfile, const char *path);
  * but it can be worked with like any other closed tempfile (for
  * example, it can be opened using reopen_tempfile()).
  */
-extern void register_tempfile(struct tempfile *tempfile, const char *path);
+extern struct tempfile *register_tempfile(const char *path);
 
 
 /*
@@ -134,83 +128,78 @@ extern void register_tempfile(struct tempfile *tempfile, const char *path);
  * know the (absolute) path of the file that was created, it can be
  * read from tempfile->filename.
  *
- * On success, the functions return a file descriptor that is open for
- * writing the temporary file. On errors, they return -1 and set errno
- * appropriately (except for the "x" variants, which die() on errors).
+ * On success, the functions return a tempfile whose "fd" member is open
+ * for writing the temporary file. On errors, they return NULL and set
+ * errno appropriately (except for the "x" variants, which die() on
+ * errors).
  */
 
 /* See "mks_tempfile functions" above. */
-extern int mks_tempfile_sm(struct tempfile *tempfile,
-			   const char *template, int suffixlen, int mode);
+extern struct tempfile *mks_tempfile_sm(const char *template,
+					int suffixlen, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_s(struct tempfile *tempfile,
-				 const char *template, int suffixlen)
+static inline struct tempfile *mks_tempfile_s(const char *template,
+					      int suffixlen)
 {
-	return mks_tempfile_sm(tempfile, template, suffixlen, 0600);
+	return mks_tempfile_sm(template, suffixlen, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_m(struct tempfile *tempfile,
-				 const char *template, int mode)
+static inline struct tempfile *mks_tempfile_m(const char *template, int mode)
 {
-	return mks_tempfile_sm(tempfile, template, 0, mode);
+	return mks_tempfile_sm(template, 0, mode);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile(struct tempfile *tempfile,
-			       const char *template)
+static inline struct tempfile *mks_tempfile(const char *template)
 {
-	return mks_tempfile_sm(tempfile, template, 0, 0600);
+	return mks_tempfile_sm(template, 0, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-extern int mks_tempfile_tsm(struct tempfile *tempfile,
-			    const char *template, int suffixlen, int mode);
+extern struct tempfile *mks_tempfile_tsm(const char *template,
+					 int suffixlen, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_ts(struct tempfile *tempfile,
-				  const char *template, int suffixlen)
+static inline struct tempfile *mks_tempfile_ts(const char *template,
+					       int suffixlen)
 {
-	return mks_tempfile_tsm(tempfile, template, suffixlen, 0600);
+	return mks_tempfile_tsm(template, suffixlen, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_tm(struct tempfile *tempfile,
-				  const char *template, int mode)
+static inline struct tempfile *mks_tempfile_tm(const char *template, int mode)
 {
-	return mks_tempfile_tsm(tempfile, template, 0, mode);
+	return mks_tempfile_tsm(template, 0, mode);
 }
 
 /* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_t(struct tempfile *tempfile,
-				 const char *template)
+static inline struct tempfile *mks_tempfile_t(const char *template)
 {
-	return mks_tempfile_tsm(tempfile, template, 0, 0600);
+	return mks_tempfile_tsm(template, 0, 0600);
 }
 
 /* See "mks_tempfile functions" above. */
-extern int xmks_tempfile_m(struct tempfile *tempfile,
-			   const char *template, int mode);
+extern struct tempfile *xmks_tempfile_m(const char *template, int mode);
 
 /* See "mks_tempfile functions" above. */
-static inline int xmks_tempfile(struct tempfile *tempfile,
-				const char *template)
+static inline struct tempfile *xmks_tempfile(const char *template)
 {
-	return xmks_tempfile_m(tempfile, template, 0600);
+	return xmks_tempfile_m(template, 0600);
 }
 
 /*
  * Associate a stdio stream with the temporary file (which must still
  * be open). Return `NULL` (*without* deleting the file) on error. The
- * stream is closed automatically when `close_tempfile()` is called or
+ * stream is closed automatically when `close_tempfile_gently()` is called or
  * when the file is deleted or renamed.
  */
 extern FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode);
 
 static inline int is_tempfile_active(struct tempfile *tempfile)
 {
-	return tempfile->active;
+	return tempfile && tempfile->active;
 }
 
 /*
@@ -226,20 +215,20 @@ extern FILE *get_tempfile_fp(struct tempfile *tempfile);
  * If the temporary file is still open, close it (and the file pointer
  * too, if it has been opened using `fdopen_tempfile()`) without
  * deleting the file. Return 0 upon success. On failure to `close(2)`,
- * return a negative value and delete the file. Usually
- * `delete_tempfile()` or `rename_tempfile()` should eventually be
- * called if `close_tempfile()` succeeds.
+ * return a negative value. Usually `delete_tempfile()` or `rename_tempfile()`
+ * should eventually be called regardless of whether `close_tempfile_gently()`
+ * succeeds.
  */
-extern int close_tempfile(struct tempfile *tempfile);
+extern int close_tempfile_gently(struct tempfile *tempfile);
 
 /*
  * Re-open a temporary file that has been closed using
- * `close_tempfile()` but not yet deleted or renamed. This can be used
+ * `close_tempfile_gently()` but not yet deleted or renamed. This can be used
  * to implement a sequence of operations like the following:
  *
  * * Create temporary file.
  *
- * * Write new contents to file, then `close_tempfile()` to cause the
+ * * Write new contents to file, then `close_tempfile_gently()` to cause the
  *   contents to be written to disk.
  *
  * * Pass the name of the temporary file to another program to allow
@@ -259,7 +248,7 @@ extern int reopen_tempfile(struct tempfile *tempfile);
  * `delete_tempfile()` for a `tempfile` object that has already been
  * deleted or renamed.
  */
-extern void delete_tempfile(struct tempfile *tempfile);
+extern void delete_tempfile(struct tempfile **tempfile_p);
 
 /*
  * Close the file descriptor and/or file pointer if they are still
@@ -270,6 +259,6 @@ extern void delete_tempfile(struct tempfile *tempfile);
  * `rename(2)`. It is a bug to call `rename_tempfile()` for a
  * `tempfile` object that is not currently active.
  */
-extern int rename_tempfile(struct tempfile *tempfile, const char *path);
+extern int rename_tempfile(struct tempfile **tempfile_p, const char *path);
 
 #endif /* TEMPFILE_H */
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample
index b7f81c198..db5feab8a 100755
--- a/templates/hooks--pre-rebase.sample
+++ b/templates/hooks--pre-rebase.sample
@@ -58,7 +58,7 @@ then
 	not_in_topic=`git rev-list "^$topic" master`
 	if test -z "$not_in_topic"
 	then
-		echo >&2 "$topic is already up-to-date with master"
+		echo >&2 "$topic is already up to date with master"
 		exit 1 ;# we could allow it, but there is no point.
 	else
 		exit 0
diff --git a/templates/hooks--prepare-commit-msg.sample b/templates/hooks--prepare-commit-msg.sample
index 86b8f227e..318afe3fd 100755
--- a/templates/hooks--prepare-commit-msg.sample
+++ b/templates/hooks--prepare-commit-msg.sample
@@ -9,8 +9,8 @@
 #
 # To enable this hook, rename this file to "prepare-commit-msg".
 
-# This hook includes three examples.  The first comments out the
-# "Conflicts:" part of a merge commit.
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
 #
 # The second includes the output of "git diff --name-status -r"
 # into the message, just before the "git status" output.  It is
@@ -20,17 +20,23 @@
 # The third example adds a Signed-off-by line to the message, that can
 # still be edited.  This is rarely a good idea.
 
-case "$2,$3" in
-  merge,)
-    @PERL_PATH@ -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
 
-# ,|template,)
-#   @PERL_PATH@ -i.bak -pe '
-#      print "\n" . `git diff --cached --name-status -r`
-#	 if /^#/ && $first++ == 0' "$1" ;;
+@PERL_PATH@ -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
 
-  *) ;;
-esac
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    @PERL_PATH@ -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
 
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   @PERL_PATH@ -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/trailer.c b/trailer.c
index 751b56c00..3ba157ed0 100644
--- a/trailer.c
+++ b/trailer.c
@@ -10,18 +10,13 @@
  * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
  */
 
-enum action_where { WHERE_END, WHERE_AFTER, WHERE_BEFORE, WHERE_START };
-enum action_if_exists { EXISTS_ADD_IF_DIFFERENT_NEIGHBOR, EXISTS_ADD_IF_DIFFERENT,
-			EXISTS_ADD, EXISTS_REPLACE, EXISTS_DO_NOTHING };
-enum action_if_missing { MISSING_ADD, MISSING_DO_NOTHING };
-
 struct conf_info {
 	char *name;
 	char *key;
 	char *command;
-	enum action_where where;
-	enum action_if_exists if_exists;
-	enum action_if_missing if_missing;
+	enum trailer_where where;
+	enum trailer_if_exists if_exists;
+	enum trailer_if_missing if_missing;
 };
 
 static struct conf_info default_conf_info;
@@ -63,7 +58,7 @@ static const char *git_generated_prefixes[] = {
 		pos != (head); \
 		pos = is_reverse ? pos->prev : pos->next)
 
-static int after_or_end(enum action_where where)
+static int after_or_end(enum trailer_where where)
 {
 	return (where == WHERE_AFTER) || (where == WHERE_END);
 }
@@ -164,13 +159,15 @@ static void print_tok_val(FILE *outfile, const char *tok, const char *val)
 		fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
 }
 
-static void print_all(FILE *outfile, struct list_head *head, int trim_empty)
+static void print_all(FILE *outfile, struct list_head *head,
+		      const struct process_trailer_options *opts)
 {
 	struct list_head *pos;
 	struct trailer_item *item;
 	list_for_each(pos, head) {
 		item = list_entry(pos, struct trailer_item, list);
-		if (!trim_empty || strlen(item->value) > 0)
+		if ((!opts->trim_empty || strlen(item->value) > 0) &&
+		    (!opts->only_trailers || item->token))
 			print_tok_val(outfile, item->token, item->value);
 	}
 }
@@ -201,7 +198,7 @@ static int check_if_different(struct trailer_item *in_tok,
 			      int check_all,
 			      struct list_head *head)
 {
-	enum action_where where = arg_tok->conf.where;
+	enum trailer_where where = arg_tok->conf.where;
 	struct list_head *next_head;
 	do {
 		if (same_trailer(in_tok, arg_tok))
@@ -300,13 +297,16 @@ static void apply_arg_if_exists(struct trailer_item *in_tok,
 		else
 			free_arg_item(arg_tok);
 		break;
+	default:
+		die("BUG: trailer.c: unhandled value %d",
+		    arg_tok->conf.if_exists);
 	}
 }
 
 static void apply_arg_if_missing(struct list_head *head,
 				 struct arg_item *arg_tok)
 {
-	enum action_where where;
+	enum trailer_where where;
 	struct trailer_item *to_add;
 
 	switch (arg_tok->conf.if_missing) {
@@ -321,6 +321,10 @@ static void apply_arg_if_missing(struct list_head *head,
 			list_add_tail(&to_add->list, head);
 		else
 			list_add(&to_add->list, head);
+		break;
+	default:
+		die("BUG: trailer.c: unhandled value %d",
+		    arg_tok->conf.if_missing);
 	}
 }
 
@@ -331,7 +335,7 @@ static int find_same_and_apply_arg(struct list_head *head,
 	struct trailer_item *in_tok;
 	struct trailer_item *on_tok;
 
-	enum action_where where = arg_tok->conf.where;
+	enum trailer_where where = arg_tok->conf.where;
 	int middle = (where == WHERE_AFTER) || (where == WHERE_BEFORE);
 	int backwards = after_or_end(where);
 	struct trailer_item *start_tok;
@@ -373,44 +377,50 @@ static void process_trailers_lists(struct list_head *head,
 	}
 }
 
-static int set_where(struct conf_info *item, const char *value)
+int trailer_set_where(enum trailer_where *item, const char *value)
 {
-	if (!strcasecmp("after", value))
-		item->where = WHERE_AFTER;
+	if (!value)
+		*item = WHERE_DEFAULT;
+	else if (!strcasecmp("after", value))
+		*item = WHERE_AFTER;
 	else if (!strcasecmp("before", value))
-		item->where = WHERE_BEFORE;
+		*item = WHERE_BEFORE;
 	else if (!strcasecmp("end", value))
-		item->where = WHERE_END;
+		*item = WHERE_END;
 	else if (!strcasecmp("start", value))
-		item->where = WHERE_START;
+		*item = WHERE_START;
 	else
 		return -1;
 	return 0;
 }
 
-static int set_if_exists(struct conf_info *item, const char *value)
+int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
 {
-	if (!strcasecmp("addIfDifferent", value))
-		item->if_exists = EXISTS_ADD_IF_DIFFERENT;
+	if (!value)
+		*item = EXISTS_DEFAULT;
+	else if (!strcasecmp("addIfDifferent", value))
+		*item = EXISTS_ADD_IF_DIFFERENT;
 	else if (!strcasecmp("addIfDifferentNeighbor", value))
-		item->if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
+		*item = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
 	else if (!strcasecmp("add", value))
-		item->if_exists = EXISTS_ADD;
+		*item = EXISTS_ADD;
 	else if (!strcasecmp("replace", value))
-		item->if_exists = EXISTS_REPLACE;
+		*item = EXISTS_REPLACE;
 	else if (!strcasecmp("doNothing", value))
-		item->if_exists = EXISTS_DO_NOTHING;
+		*item = EXISTS_DO_NOTHING;
 	else
 		return -1;
 	return 0;
 }
 
-static int set_if_missing(struct conf_info *item, const char *value)
+int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
 {
-	if (!strcasecmp("doNothing", value))
-		item->if_missing = MISSING_DO_NOTHING;
+	if (!value)
+		*item = MISSING_DEFAULT;
+	else if (!strcasecmp("doNothing", value))
+		*item = MISSING_DO_NOTHING;
 	else if (!strcasecmp("add", value))
-		item->if_missing = MISSING_ADD;
+		*item = MISSING_ADD;
 	else
 		return -1;
 	return 0;
@@ -470,15 +480,18 @@ static int git_trailer_default_config(const char *conf_key, const char *value, v
 	variable_name = strrchr(trailer_item, '.');
 	if (!variable_name) {
 		if (!strcmp(trailer_item, "where")) {
-			if (set_where(&default_conf_info, value) < 0)
+			if (trailer_set_where(&default_conf_info.where,
+					      value) < 0)
 				warning(_("unknown value '%s' for key '%s'"),
 					value, conf_key);
 		} else if (!strcmp(trailer_item, "ifexists")) {
-			if (set_if_exists(&default_conf_info, value) < 0)
+			if (trailer_set_if_exists(&default_conf_info.if_exists,
+						  value) < 0)
 				warning(_("unknown value '%s' for key '%s'"),
 					value, conf_key);
 		} else if (!strcmp(trailer_item, "ifmissing")) {
-			if (set_if_missing(&default_conf_info, value) < 0)
+			if (trailer_set_if_missing(&default_conf_info.if_missing,
+						   value) < 0)
 				warning(_("unknown value '%s' for key '%s'"),
 					value, conf_key);
 		} else if (!strcmp(trailer_item, "separators")) {
@@ -532,15 +545,15 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
 		conf->command = xstrdup(value);
 		break;
 	case TRAILER_WHERE:
-		if (set_where(conf, value))
+		if (trailer_set_where(&conf->where, value))
 			warning(_("unknown value '%s' for key '%s'"), value, conf_key);
 		break;
 	case TRAILER_IF_EXISTS:
-		if (set_if_exists(conf, value))
+		if (trailer_set_if_exists(&conf->if_exists, value))
 			warning(_("unknown value '%s' for key '%s'"), value, conf_key);
 		break;
 	case TRAILER_IF_MISSING:
-		if (set_if_missing(conf, value))
+		if (trailer_set_if_missing(&conf->if_missing, value))
 			warning(_("unknown value '%s' for key '%s'"), value, conf_key);
 		break;
 	default:
@@ -555,6 +568,9 @@ static void ensure_configured(void)
 		return;
 
 	/* Default config must be setup first */
+	default_conf_info.where = WHERE_END;
+	default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
+	default_conf_info.if_missing = MISSING_ADD;
 	git_config(git_trailer_default_config, NULL);
 	git_config(git_trailer_config, NULL);
 	configured = 1;
@@ -658,19 +674,27 @@ static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
 }
 
 static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
-			 const struct conf_info *conf)
+			 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);
+	if (new_trailer_item) {
+		if (new_trailer_item->where != WHERE_DEFAULT)
+			new->conf.where = new_trailer_item->where;
+		if (new_trailer_item->if_exists != EXISTS_DEFAULT)
+			new->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;
+	}
 	list_add_tail(&new->list, arg_head);
 }
 
 static void process_command_line_args(struct list_head *arg_head,
-				      struct string_list *trailers)
+				      struct list_head *new_trailer_head)
 {
-	struct string_list_item *tr;
 	struct arg_item *item;
 	struct strbuf tok = STRBUF_INIT;
 	struct strbuf val = STRBUF_INIT;
@@ -690,26 +714,29 @@ static void process_command_line_args(struct list_head *arg_head,
 			add_arg_item(arg_head,
 				     xstrdup(token_from_item(item, NULL)),
 				     xstrdup(""),
-				     &item->conf);
+				     &item->conf, NULL);
 	}
 
 	/* Add an arg item for each trailer on the command line */
-	for_each_string_list_item(tr, trailers) {
-		int separator_pos = find_separator(tr->string, cl_separators);
+	list_for_each(pos, new_trailer_head) {
+		struct new_trailer_item *tr =
+			list_entry(pos, struct new_trailer_item, list);
+		int separator_pos = find_separator(tr->text, cl_separators);
+
 		if (separator_pos == 0) {
 			struct strbuf sb = STRBUF_INIT;
-			strbuf_addstr(&sb, tr->string);
+			strbuf_addstr(&sb, tr->text);
 			strbuf_trim(&sb);
 			error(_("empty trailer token in trailer '%.*s'"),
 			      (int) sb.len, sb.buf);
 			strbuf_release(&sb);
 		} else {
-			parse_trailer(&tok, &val, &conf, tr->string,
+			parse_trailer(&tok, &val, &conf, tr->text,
 				      separator_pos);
 			add_arg_item(arg_head,
 				     strbuf_detach(&tok, NULL),
 				     strbuf_detach(&val, NULL),
-				     conf);
+				     conf, tr);
 		}
 	}
 
@@ -885,9 +912,37 @@ static int ends_with_blank_line(const char *buf, size_t len)
 	return is_blank_line(buf + ll);
 }
 
+static void unfold_value(struct strbuf *val)
+{
+	struct strbuf out = STRBUF_INIT;
+	size_t i;
+
+	strbuf_grow(&out, val->len);
+	i = 0;
+	while (i < val->len) {
+		char c = val->buf[i++];
+		if (c == '\n') {
+			/* Collapse continuation down to a single space. */
+			while (i < val->len && isspace(val->buf[i]))
+				i++;
+			strbuf_addch(&out, ' ');
+		} else {
+			strbuf_addch(&out, c);
+		}
+	}
+
+	/* Empty lines may have left us with whitespace cruft at the edges */
+	strbuf_trim(&out);
+
+	/* output goes back to val as if we modified it in-place */
+	strbuf_swap(&out, val);
+	strbuf_release(&out);
+}
+
 static int process_input_file(FILE *outfile,
 			      const char *str,
-			      struct list_head *head)
+			      struct list_head *head,
+			      const struct process_trailer_options *opts)
 {
 	struct trailer_info info;
 	struct strbuf tok = STRBUF_INIT;
@@ -897,9 +952,10 @@ static int process_input_file(FILE *outfile,
 	trailer_info_get(&info, str);
 
 	/* Print lines before the trailers as is */
-	fwrite(str, 1, info.trailer_start - str, outfile);
+	if (!opts->only_trailers)
+		fwrite(str, 1, info.trailer_start - str, outfile);
 
-	if (!info.blank_line_before_trailer)
+	if (!opts->only_trailers && !info.blank_line_before_trailer)
 		fprintf(outfile, "\n");
 
 	for (i = 0; i < info.trailer_nr; i++) {
@@ -911,10 +967,12 @@ static int process_input_file(FILE *outfile,
 		if (separator_pos >= 1) {
 			parse_trailer(&tok, &val, NULL, trailer,
 				      separator_pos);
+			if (opts->unfold)
+				unfold_value(&val);
 			add_trailer_item(head,
 					 strbuf_detach(&tok, NULL),
 					 strbuf_detach(&val, NULL));
-		} else {
+		} else if (!opts->only_trailers) {
 			strbuf_addstr(&val, trailer);
 			strbuf_strip_suffix(&val, "\n");
 			add_trailer_item(head,
@@ -937,7 +995,7 @@ static void free_all(struct list_head *head)
 	}
 }
 
-static struct tempfile trailers_tempfile;
+static struct tempfile *trailers_tempfile;
 
 static FILE *create_in_place_tempfile(const char *file)
 {
@@ -959,19 +1017,20 @@ static FILE *create_in_place_tempfile(const char *file)
 		strbuf_add(&template, file, tail - file + 1);
 	strbuf_addstr(&template, "git-interpret-trailers-XXXXXX");
 
-	xmks_tempfile_m(&trailers_tempfile, template.buf, st.st_mode);
+	trailers_tempfile = xmks_tempfile_m(template.buf, st.st_mode);
 	strbuf_release(&template);
-	outfile = fdopen_tempfile(&trailers_tempfile, "w");
+	outfile = fdopen_tempfile(trailers_tempfile, "w");
 	if (!outfile)
 		die_errno(_("could not open temporary file"));
 
 	return outfile;
 }
 
-void process_trailers(const char *file, int in_place, int trim_empty, struct string_list *trailers)
+void process_trailers(const char *file,
+		      const struct process_trailer_options *opts,
+		      struct list_head *new_trailer_head)
 {
 	LIST_HEAD(head);
-	LIST_HEAD(arg_head);
 	struct strbuf sb = STRBUF_INIT;
 	int trailer_end;
 	FILE *outfile = stdout;
@@ -980,24 +1039,27 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str
 
 	read_input_file(&sb, file);
 
-	if (in_place)
+	if (opts->in_place)
 		outfile = create_in_place_tempfile(file);
 
 	/* Print the lines before the trailers */
-	trailer_end = process_input_file(outfile, sb.buf, &head);
-
-	process_command_line_args(&arg_head, trailers);
+	trailer_end = process_input_file(outfile, sb.buf, &head, opts);
 
-	process_trailers_lists(&head, &arg_head);
+	if (!opts->only_input) {
+		LIST_HEAD(arg_head);
+		process_command_line_args(&arg_head, new_trailer_head);
+		process_trailers_lists(&head, &arg_head);
+	}
 
-	print_all(outfile, &head, trim_empty);
+	print_all(outfile, &head, opts);
 
 	free_all(&head);
 
 	/* Print the lines after the trailers as is */
-	fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
+	if (!opts->only_trailers)
+		fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
 
-	if (in_place)
+	if (opts->in_place)
 		if (rename_tempfile(&trailers_tempfile, file))
 			die_errno(_("could not rename temporary file to %s"), file);
 
@@ -1054,3 +1116,49 @@ void trailer_info_release(struct trailer_info *info)
 		free(info->trailers[i]);
 	free(info->trailers);
 }
+
+static void format_trailer_info(struct strbuf *out,
+				const struct trailer_info *info,
+				const struct process_trailer_options *opts)
+{
+	int i;
+
+	/* If we want the whole block untouched, we can take the fast path. */
+	if (!opts->only_trailers && !opts->unfold) {
+		strbuf_add(out, info->trailer_start,
+			   info->trailer_end - info->trailer_start);
+		return;
+	}
+
+	for (i = 0; i < info->trailer_nr; i++) {
+		char *trailer = info->trailers[i];
+		int separator_pos = find_separator(trailer, separators);
+
+		if (separator_pos >= 1) {
+			struct strbuf tok = STRBUF_INIT;
+			struct strbuf val = STRBUF_INIT;
+
+			parse_trailer(&tok, &val, NULL, trailer, separator_pos);
+			if (opts->unfold)
+				unfold_value(&val);
+
+			strbuf_addf(out, "%s: %s\n", tok.buf, val.buf);
+			strbuf_release(&tok);
+			strbuf_release(&val);
+
+		} else if (!opts->only_trailers) {
+			strbuf_addstr(out, trailer);
+		}
+	}
+
+}
+
+void format_trailers_from_commit(struct strbuf *out, const char *msg,
+				 const struct process_trailer_options *opts)
+{
+	struct trailer_info info;
+
+	trailer_info_get(&info, msg);
+	format_trailer_info(out, &info, opts);
+	trailer_info_release(&info);
+}
diff --git a/trailer.h b/trailer.h
index 65cc5d79c..6d7f8c2a5 100644
--- a/trailer.h
+++ b/trailer.h
@@ -1,6 +1,33 @@
 #ifndef TRAILER_H
 #define TRAILER_H
 
+#include "list.h"
+
+enum trailer_where {
+	WHERE_DEFAULT,
+	WHERE_END,
+	WHERE_AFTER,
+	WHERE_BEFORE,
+	WHERE_START
+};
+enum trailer_if_exists {
+	EXISTS_DEFAULT,
+	EXISTS_ADD_IF_DIFFERENT_NEIGHBOR,
+	EXISTS_ADD_IF_DIFFERENT,
+	EXISTS_ADD,
+	EXISTS_REPLACE,
+	EXISTS_DO_NOTHING
+};
+enum trailer_if_missing {
+	MISSING_DEFAULT,
+	MISSING_ADD,
+	MISSING_DO_NOTHING
+};
+
+int trailer_set_where(enum trailer_where *item, const char *value);
+int trailer_set_if_exists(enum trailer_if_exists *item, const char *value);
+int trailer_set_if_missing(enum trailer_if_missing *item, const char *value);
+
 struct trailer_info {
 	/*
 	 * True if there is a blank line before the location pointed to by
@@ -22,11 +49,50 @@ struct trailer_info {
 	size_t trailer_nr;
 };
 
-void process_trailers(const char *file, int in_place, int trim_empty,
-		      struct string_list *trailers);
+/*
+ * A list that represents newly-added trailers, such as those provided
+ * with the --trailer command line option of git-interpret-trailers.
+ */
+struct new_trailer_item {
+	struct list_head list;
+
+	const char *text;
+
+	enum trailer_where where;
+	enum trailer_if_exists if_exists;
+	enum trailer_if_missing if_missing;
+};
+
+struct process_trailer_options {
+	int in_place;
+	int trim_empty;
+	int only_trailers;
+	int only_input;
+	int unfold;
+};
+
+#define PROCESS_TRAILER_OPTIONS_INIT {0}
+
+void process_trailers(const char *file,
+		      const struct process_trailer_options *opts,
+		      struct list_head *new_trailer_head);
 
 void trailer_info_get(struct trailer_info *info, const char *str);
 
 void trailer_info_release(struct trailer_info *info);
 
+/*
+ * Format the trailers from the commit msg "msg" into the strbuf "out".
+ * Note two caveats about "opts":
+ *
+ *   - this is primarily a helper for pretty.c, and not
+ *     all of the flags are supported.
+ *
+ *   - this differs from process_trailers slightly in that we always format
+ *     only the trailer block itself, even if the "only_trailers" option is not
+ *     set.
+ */
+void format_trailers_from_commit(struct strbuf *out, const char *msg,
+				 const struct process_trailer_options *opts);
+
 #endif /* TRAILER_H */
diff --git a/transport-helper.c b/transport-helper.c
index 33cff38cc..c948d5215 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -44,8 +44,7 @@ static void sendline(struct helper_data *helper, struct strbuf *buffer)
 {
 	if (debug)
 		fprintf(stderr, "Debug: Remote helper: -> %s", buffer->buf);
-	if (write_in_full(helper->helper->in, buffer->buf, buffer->len)
-		!= buffer->len)
+	if (write_in_full(helper->helper->in, buffer->buf, buffer->len) < 0)
 		die_errno("Full write to remote helper failed");
 }
 
@@ -74,7 +73,7 @@ static void write_constant(int fd, const char *str)
 {
 	if (debug)
 		fprintf(stderr, "Debug: Remote helper: -> %s", str);
-	if (write_in_full(fd, str, strlen(str)) != strlen(str))
+	if (write_in_full(fd, str, strlen(str)) < 0)
 		die_errno("Full write to remote helper failed");
 }
 
@@ -604,6 +603,7 @@ static int process_connect_service(struct transport *transport,
 			cmdbuf.buf);
 
 exit:
+	strbuf_release(&cmdbuf);
 	fclose(input);
 	return ret;
 }
@@ -927,7 +927,7 @@ static int push_refs_with_export(struct transport *transport,
 		struct object_id oid;
 
 		private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
-		if (private && !get_sha1(private, oid.hash)) {
+		if (private && !get_oid(private, &oid)) {
 			strbuf_addf(&buf, "^%s", private);
 			string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
 			oidcpy(&ref->old_oid, &oid);
@@ -1117,6 +1117,13 @@ int transport_helper_init(struct transport *transport, const char *name)
 __attribute__((format (printf, 1, 2)))
 static void transfer_debug(const char *fmt, ...)
 {
+	/*
+	 * NEEDSWORK: This function is sometimes used from multiple threads, and
+	 * we end up using debug_enabled racily. That "should not matter" since
+	 * we always write the same value, but it's still wrong. This function
+	 * is listed in .tsan-suppressions for the time being.
+	 */
+
 	va_list args;
 	char msgbuf[PBUFFERSIZE];
 	static int debug_enabled = -1;
diff --git a/transport.c b/transport.c
index d75ff0514..f1e2f6199 100644
--- a/transport.c
+++ b/transport.c
@@ -26,7 +26,6 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 		const char *localname;
 		const char *tmp;
 		const char *remotename;
-		unsigned char sha[20];
 		int flag = 0;
 		/*
 		 * Check suitability for tracking. Must be successful /
@@ -44,7 +43,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 		localname = ref->peer_ref->name;
 		remotename = ref->name;
 		tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING,
-					 sha, &flag);
+					 NULL, &flag);
 		if (tmp && flag & REF_ISSYMREF &&
 			starts_with(tmp, "refs/heads/"))
 			localname = tmp;
@@ -472,11 +471,10 @@ void transport_print_push_status(const char *dest, struct ref *refs,
 {
 	struct ref *ref;
 	int n = 0;
-	struct object_id head_oid;
 	char *head;
 	int summary_width = transport_summary_width(refs);
 
-	head = resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL);
+	head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
 
 	if (verbose) {
 		for (ref = refs; ref; ref = ref->next)
diff --git a/tree-diff.c b/tree-diff.c
index bd6d65a40..4bb93155b 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -421,8 +421,8 @@ static struct combine_diff_path *ll_diff_tree_paths(
 	 *   diff_tree_oid(parent, commit) )
 	 */
 	for (i = 0; i < nparent; ++i)
-		tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]->hash);
-	ttree = fill_tree_descriptor(&t, oid->hash);
+		tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
+	ttree = fill_tree_descriptor(&t, oid);
 
 	/* Enable recursion indefinitely */
 	opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
diff --git a/tree-walk.c b/tree-walk.c
index 6a42e402b..684f0e337 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -78,15 +78,16 @@ int init_tree_desc_gently(struct tree_desc *desc, const void *buffer, unsigned l
 	return result;
 }
 
-void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
+void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
 {
 	unsigned long size = 0;
 	void *buf = NULL;
 
-	if (sha1) {
-		buf = read_object_with_reference(sha1, tree_type, &size, NULL);
+	if (oid) {
+		buf = read_object_with_reference(oid->hash, tree_type, &size,
+						 NULL);
 		if (!buf)
-			die("unable to read tree %s", sha1_to_hex(sha1));
+			die("unable to read tree %s", oid_to_hex(oid));
 	}
 	init_tree_desc(desc, buf, size);
 	return buf;
@@ -581,12 +582,11 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 	int retval = MISSING_OBJECT;
 	struct dir_state *parents = NULL;
 	size_t parents_alloc = 0;
-	ssize_t parents_nr = 0;
+	size_t i, parents_nr = 0;
 	unsigned char current_tree_sha1[20];
 	struct strbuf namebuf = STRBUF_INIT;
 	struct tree_desc t;
 	int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
-	int i;
 
 	init_tree_desc(&t, NULL, 0UL);
 	strbuf_addstr(&namebuf, name);
diff --git a/tree-walk.h b/tree-walk.h
index 68bb78b92..b6bd1b4cc 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -42,7 +42,7 @@ int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long
 int tree_entry(struct tree_desc *, struct name_entry *);
 int tree_entry_gently(struct tree_desc *, struct name_entry *);
 
-void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
+void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
 
 struct traverse_info;
 typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
diff --git a/unpack-trees.c b/unpack-trees.c
index 862cfce66..71b70ccb1 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,6 @@
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
+#include "repository.h"
 #include "config.h"
 #include "dir.h"
 #include "tree.h"
@@ -162,7 +163,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'.  Cannot bind.");
 
 	msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
-		_("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
+		_("Cannot update sparse checkout: the following entries are not up to date:\n%s");
 	msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
 		_("The following working tree files would be overwritten by sparse checkout update:\n%s");
 	msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
@@ -255,47 +256,41 @@ static int check_submodule_move_head(const struct cache_entry *ce,
 {
 	unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN;
 	const struct submodule *sub = submodule_from_ce(ce);
+
 	if (!sub)
 		return 0;
 
 	if (o->reset)
 		flags |= SUBMODULE_MOVE_HEAD_FORCE;
 
-	switch (sub->update_strategy.type) {
-	case SM_UPDATE_UNSPECIFIED:
-	case SM_UPDATE_CHECKOUT:
-		if (submodule_move_head(ce->name, old_id, new_id, flags))
-			return o->gently ? -1 :
-				add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
-		return 0;
-	case SM_UPDATE_NONE:
-		return 0;
-	case SM_UPDATE_REBASE:
-	case SM_UPDATE_MERGE:
-	case SM_UPDATE_COMMAND:
-	default:
-		warning(_("submodule update strategy not supported for submodule '%s'"), ce->name);
-		return -1;
-	}
+	if (submodule_move_head(ce->name, old_id, new_id, flags))
+		return o->gently ? -1 :
+				   add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
+	return 0;
 }
 
-static void reload_gitmodules_file(struct index_state *index,
-				   struct checkout *state)
+/*
+ * Preform the loading of the repository's gitmodules file.  This function is
+ * used by 'check_update()' to perform loading of the gitmodules file in two
+ * differnt situations:
+ * (1) before removing entries from the working tree if the gitmodules file has
+ *     been marked for removal.  This situation is specified by 'state' == NULL.
+ * (2) before checking out entries to the working tree if the gitmodules file
+ *     has been marked for update.  This situation is specified by 'state' != NULL.
+ */
+static void load_gitmodules_file(struct index_state *index,
+				 struct checkout *state)
 {
-	int i;
-	for (i = 0; i < index->cache_nr; i++) {
-		struct cache_entry *ce = index->cache[i];
-		if (ce->ce_flags & CE_UPDATE) {
-			int r = strcmp(ce->name, ".gitmodules");
-			if (r < 0)
-				continue;
-			else if (r == 0) {
-				submodule_free();
-				checkout_entry(ce, state, NULL);
-				gitmodules_config();
-				git_config(submodule_config, NULL);
-			} else
-				break;
+	int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE));
+
+	if (pos >= 0) {
+		struct cache_entry *ce = index->cache[pos];
+		if (!state && ce->ce_flags & CE_WT_REMOVE) {
+			repo_read_gitmodules(the_repository);
+		} else if (state && (ce->ce_flags & CE_UPDATE)) {
+			submodule_free();
+			checkout_entry(ce, state, NULL);
+			repo_read_gitmodules(the_repository);
 		}
 	}
 }
@@ -308,19 +303,9 @@ static void unlink_entry(const struct cache_entry *ce)
 {
 	const struct submodule *sub = submodule_from_ce(ce);
 	if (sub) {
-		switch (sub->update_strategy.type) {
-		case SM_UPDATE_UNSPECIFIED:
-		case SM_UPDATE_CHECKOUT:
-		case SM_UPDATE_REBASE:
-		case SM_UPDATE_MERGE:
-			/* state.force is set at the caller. */
-			submodule_move_head(ce->name, "HEAD", NULL,
-					    SUBMODULE_MOVE_HEAD_FORCE);
-			break;
-		case SM_UPDATE_NONE:
-		case SM_UPDATE_COMMAND:
-			return; /* Do not touch the submodule. */
-		}
+		/* state.force is set at the caller. */
+		submodule_move_head(ce->name, "HEAD", NULL,
+				    SUBMODULE_MOVE_HEAD_FORCE);
 	}
 	if (!check_leading_path(ce->name, ce_namelen(ce)))
 		return;
@@ -343,8 +328,7 @@ static struct progress *get_progress(struct unpack_trees_options *o)
 			total++;
 	}
 
-	return start_progress_delay(_("Checking out files"),
-				    total, 50, 1);
+	return start_delayed_progress(_("Checking out files"), total);
 }
 
 static int check_updates(struct unpack_trees_options *o)
@@ -365,6 +349,10 @@ static int check_updates(struct unpack_trees_options *o)
 
 	if (o->update)
 		git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
+
+	if (should_update_submodules() && o->update && !o->dry_run)
+		load_gitmodules_file(index, NULL);
+
 	for (i = 0; i < index->cache_nr; i++) {
 		const struct cache_entry *ce = index->cache[i];
 
@@ -378,7 +366,7 @@ static int check_updates(struct unpack_trees_options *o)
 	remove_scheduled_dirs();
 
 	if (should_update_submodules() && o->update && !o->dry_run)
-		reload_gitmodules_file(index, &state);
+		load_gitmodules_file(index, &state);
 
 	enable_delayed_checkout(&state);
 	for (i = 0; i < index->cache_nr; i++) {
@@ -395,8 +383,8 @@ static int check_updates(struct unpack_trees_options *o)
 			}
 		}
 	}
-	errs |= finish_delayed_checkout(&state);
 	stop_progress(&progress);
+	errs |= finish_delayed_checkout(&state);
 	if (o->update)
 		git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
 	return errs != 0;
@@ -662,10 +650,10 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
 		else if (i > 1 && are_same_oid(&names[i], &names[i - 2]))
 			t[i] = t[i - 2];
 		else {
-			const unsigned char *sha1 = NULL;
+			const struct object_id *oid = NULL;
 			if (dirmask & 1)
-				sha1 = names[i].oid->hash;
-			buf[nr_buf++] = fill_tree_descriptor(t+i, sha1);
+				oid = names[i].oid;
+			buf[nr_buf++] = fill_tree_descriptor(t + i, oid);
 		}
 	}
 
diff --git a/upload-pack.c b/upload-pack.c
index 7efff2fbf..e25f725c0 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -888,7 +888,7 @@ static void receive_needs(void)
 		}
 
 	shallow_nr += shallows.nr;
-	free(shallows.objects);
+	object_array_clear(&shallows);
 }
 
 /* return non-zero if the ref is hidden, otherwise 0 */
@@ -965,11 +965,10 @@ static int find_symref(const char *refname, const struct object_id *oid,
 {
 	const char *symref_target;
 	struct string_list_item *item;
-	struct object_id unused;
 
 	if ((flag & REF_ISSYMREF) == 0)
 		return 0;
-	symref_target = resolve_ref_unsafe(refname, 0, unused.hash, &flag);
+	symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
 	if (!symref_target || (flag & REF_ISSYMREF) == 0)
 		die("'%s' is a symref but it is not?", refname);
 	item = string_list_append(cb_data, refname);
diff --git a/usage.c b/usage.c
index 1ea7df9a2..cdd534c9d 100644
--- a/usage.c
+++ b/usage.c
@@ -241,3 +241,18 @@ NORETURN void BUG(const char *fmt, ...)
 	va_end(ap);
 }
 #endif
+
+#ifdef SUPPRESS_ANNOTATED_LEAKS
+void unleak_memory(const void *ptr, size_t len)
+{
+	static struct suppressed_leak_root {
+		struct suppressed_leak_root *next;
+		char data[FLEX_ARRAY];
+	} *suppressed_leaks;
+	struct suppressed_leak_root *root;
+
+	FLEX_ALLOC_MEM(root, data, ptr, len);
+	root->next = suppressed_leaks;
+	suppressed_leaks = root;
+}
+#endif
diff --git a/userdiff.c b/userdiff.c
index d31466722..dbfb4e13c 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -293,6 +293,7 @@ struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
 		strbuf_addf(&name, "textconv/%s", driver->name);
 		notes_cache_init(c, name.buf, driver->textconv);
 		driver->textconv_cache = c;
+		strbuf_release(&name);
 	}
 
 	return driver;
diff --git a/utf8.c b/utf8.c
index 0c8e011a5..2c27ce013 100644
--- a/utf8.c
+++ b/utf8.c
@@ -32,7 +32,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max)
 	if (ucs < table[0].first || ucs > table[max].last)
 		return 0;
 	while (max >= min) {
-		mid = (min + max) / 2;
+		mid = min + (max - min) / 2;
 		if (ucs > table[mid].last)
 			min = mid + 1;
 		else if (ucs < table[mid].first)
@@ -381,7 +381,7 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
 		old = src;
 		n = utf8_width((const char**)&src, NULL);
 		if (!src) 	/* broken utf-8, do nothing */
-			return;
+			goto out;
 		if (n && w >= pos && w < pos + width) {
 			if (subst) {
 				memcpy(dst, subst, subst_len);
@@ -397,6 +397,7 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
 	}
 	strbuf_setlen(&sb_dst, dst - sb_dst.buf);
 	strbuf_swap(sb_src, &sb_dst);
+out:
 	strbuf_release(&sb_dst);
 }
 
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ec6b35061..08d136b8c 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -318,6 +318,7 @@ static void end_revision(const char *note_ref)
 		strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision);
 		fast_export_note(mark.buf, "inline");
 		fast_export_buf_to_data(&rev_ctx.note);
+		strbuf_release(&mark);
 	}
 }
 
diff --git a/worktree.c b/worktree.c
index e28ffbeb0..70015629d 100644
--- a/worktree.c
+++ b/worktree.c
@@ -30,7 +30,7 @@ static void add_head_info(struct worktree *wt)
 
 	target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
 					 "HEAD",
-					 RESOLVE_REF_READING,
+					 0,
 					 wt->head_sha1, &flags);
 	if (!target)
 		return;
@@ -307,7 +307,6 @@ const struct worktree *find_shared_symref(const char *symref,
 	for (i = 0; worktrees[i]; i++) {
 		struct worktree *wt = worktrees[i];
 		const char *symref_target;
-		unsigned char sha1[20];
 		struct ref_store *refs;
 		int flags;
 
@@ -327,7 +326,7 @@ const struct worktree *find_shared_symref(const char *symref,
 
 		refs = get_worktree_ref_store(wt);
 		symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
-							sha1, &flags);
+							NULL, &flags);
 		if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) {
 			existing = wt;
 			break;
@@ -386,3 +385,25 @@ int submodule_uses_worktrees(const char *path)
 	closedir(dir);
 	return ret;
 }
+
+int other_head_refs(each_ref_fn fn, void *cb_data)
+{
+	struct worktree **worktrees, **p;
+	int ret = 0;
+
+	worktrees = get_worktrees(0);
+	for (p = worktrees; *p; p++) {
+		struct worktree *wt = *p;
+		struct ref_store *refs;
+
+		if (wt->is_current)
+			continue;
+
+		refs = get_worktree_ref_store(wt);
+		ret = refs_head_ref(refs, fn, cb_data);
+		if (ret)
+			break;
+	}
+	free_worktrees(worktrees);
+	return ret;
+}
diff --git a/worktree.h b/worktree.h
index 5ea5e503f..9276c81ae 100644
--- a/worktree.h
+++ b/worktree.h
@@ -1,6 +1,8 @@
 #ifndef WORKTREE_H
 #define WORKTREE_H
 
+#include "refs.h"
+
 struct worktree {
 	char *path;
 	char *id;
@@ -70,6 +72,12 @@ extern void free_worktrees(struct worktree **);
 extern const struct worktree *find_shared_symref(const char *symref,
 						 const char *target);
 
+/*
+ * Similar to head_ref() for all HEADs _except_ one from the current
+ * worktree, which is covered by head_ref().
+ */
+int other_head_refs(each_ref_fn fn, void *cb_data);
+
 int is_worktree_being_rebased(const struct worktree *wt, const char *target);
 int is_worktree_being_bisected(const struct worktree *wt, const char *target);
 
diff --git a/wrapper.c b/wrapper.c
index 36630e5d1..61aba0b5c 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -652,7 +652,7 @@ int xsnprintf(char *dst, size_t max, const char *fmt, ...)
 void write_file_buf(const char *path, const char *buf, size_t len)
 {
 	int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	if (write_in_full(fd, buf, len) != len)
+	if (write_in_full(fd, buf, len) < 0)
 		die_errno(_("could not write to %s"), path);
 	if (close(fd))
 		die_errno(_("could not close %s"), path);
diff --git a/wt-status.c b/wt-status.c
index 77c27c511..29bc64cc0 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -121,15 +121,13 @@ static void status_printf_more(struct wt_status *s, const char *color,
 
 void wt_status_prepare(struct wt_status *s)
 {
-	struct object_id oid;
-
 	memset(s, 0, sizeof(*s));
 	memcpy(s->color_palette, default_wt_status_colors,
 	       sizeof(default_wt_status_colors));
 	s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 	s->use_color = -1;
 	s->relative_paths = 1;
-	s->branch = resolve_refdup("HEAD", 0, oid.hash, NULL);
+	s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
 	s->reference = "HEAD";
 	s->fp = stdout;
 	s->index_file = get_index_file();
@@ -934,7 +932,7 @@ size_t wt_status_locate_end(const char *s, size_t len)
 
 void wt_status_add_cut_line(FILE *fp)
 {
-	const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
+	const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
 	struct strbuf buf = STRBUF_INIT;
 
 	fprintf(fp, "%c %s", comment_line_char, cut_line);
@@ -1026,6 +1024,7 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
 				 comment_line_char);
 	else
 		fputs("\n", s->fp);
+	strbuf_release(&sb);
 }
 
 static int has_unmerged(struct wt_status *s)
@@ -1193,6 +1192,7 @@ static int read_rebase_todolist(const char *fname, struct string_list *lines)
 		string_list_append(lines, line.buf);
 	}
 	fclose(f);
+	strbuf_release(&line);
 	return 0;
 }
 
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index a613efc70..9f91702de 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -166,7 +166,7 @@ static int binary_search(struct entry **sequence, int longest,
 	int left = -1, right = longest;
 
 	while (left + 1 < right) {
-		int middle = (left + right) / 2;
+		int middle = left + (right - left) / 2;
 		/* by construction, no two entries can be equal */
 		if (sequence[middle]->line2 > entry->line2)
 			right = middle;